Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds JSONEditor.plugins.selectize.remove_button option and Semantic UI theme #644

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+392 −16
Open

Adds JSONEditor.plugins.selectize.remove_button option and Semantic UI theme #644

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
725375e
adds start for Semantic UI theme and supports JSONEditor.plugins.sele…
Aug 7, 2016
062aafa
improves tab styles
Aug 9, 2016
065cf8b
style changes - semantic ui
Aug 10, 2016
22ccdd2
semantic ui tweaks
Aug 26, 2016
d5ccd6f
adds selectize.multiArrayOnly setting to turn it off for normal selec…
Aug 27, 2016
75a0eec
skips the empty div inside of a getGridContainer(). It breaks semanti…
Sep 2, 2016
4397571
huge improvments re: grids
Sep 2, 2016
443e54e
padded grid
Oct 20, 2016
8bcd45c
allow passing in function that resolves external refs
Feb 22, 2017
503ce8b
Revert "allow passing in function that resolves external refs"
Feb 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
allow passing in function that resolves external refs
Alvin committed Feb 22, 2017
commit 8bcd45cb3534156d7a23b1eaebfcb8155d1005e3
95 changes: 69 additions & 26 deletions dist/jsoneditor.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/jsoneditor.js.map
View file

Large diffs are not rendered by default.

28 changes: 10 additions & 18 deletions dist/jsoneditor.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/jsoneditor.min.js.map
View file

Large diffs are not rendered by default.

8 changes: 6 additions & 2 deletions src/core.js
View file
Original file line number Diff line number Diff line change
@@ -359,7 +359,7 @@ JSONEditor.prototype = {
}

return refs;
},
},
_loadExternalRefs: function(schema, callback) {
var self = this;
var refs = this._getExternalRefs(schema);
@@ -368,7 +368,11 @@ JSONEditor.prototype = {

$each(refs,function(url) {
if(self.refs[url]) return;
if(!self.options.ajax) throw "Must set ajax option to true to load external ref "+url;
if(self.options.resolveReferenceUrl && typeof(self.options.resolveReferenceUrl) == "function") {
var u = self.options.resolveReferenceUrl(url);
if (u) self.refs[url] = u;
}
else if(!self.options.ajax) throw "Must set ajax option to true to load external ref "+url;
self.refs[url] = 'loading';
waiting++;

9 changes: 5 additions & 4 deletions src/themes/semantic_ui.js
View file
Original file line number Diff line number Diff line change
@@ -102,7 +102,7 @@ JSONEditor.defaults.themes.semantic_ui = JSONEditor.AbstractTheme.extend({
},
getButtonHolder: function() {
var el = document.createElement('div');
el.className="button-holder"
el.className="button-holder";
//el.style.float = "right";
return el;
},
@@ -117,16 +117,17 @@ JSONEditor.defaults.themes.semantic_ui = JSONEditor.AbstractTheme.extend({
return el;
},
addInputError: function(input, text) {
console.log(['erroradd', input]);

if(!input.errmsg) {
/*
var group = this.closest(input,'.field');
var target = $(group).find('label')[0];
input.errmsg = document.createElement('small');
input.errmsg.setAttribute('class','error');
input.errmsg.style = input.errmsg.style || {};
input.errmsg.style.float = 'right';
target.appendChild(input.errmsg);
*/
}
else {
input.errmsg.style.display = 'block';
@@ -147,8 +148,8 @@ JSONEditor.defaults.themes.semantic_ui = JSONEditor.AbstractTheme.extend({
},
getTabContent: function() {
var el = document.createElement('div');
el.className = "tab-contents"
return el
el.className = "tab-contents";
return el;
},
getTab: function(text) {
var el = document.createElement('a');