Skip to content

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

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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
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
175 changes: 169 additions & 6 deletions dist/jsoneditor.js
View file
Open in desktop

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
Open in desktop

Large diffs are not rendered by default.

16 changes: 14 additions & 2 deletions dist/jsoneditor.min.js
View file
Open in desktop

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/defaults.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ JSONEditor.defaults.resolvers.unshift(function(schema) {
return "checkbox";
}
// Otherwise, default to select menu
return (JSONEditor.plugins.selectize.enable) ? 'selectize' : 'select';
return (JSONEditor.plugins.selectize.enable && !JSONEditor.plugins.selectize.multiArrayOnly) ? 'selectize' : 'select';
}
});
// Use the multiple editor for schemas where the `type` is set to "any"
Expand Down Expand Up @@ -280,7 +280,7 @@ JSONEditor.defaults.resolvers.unshift(function(schema) {
});
// Use the `select` editor for dynamic enumSource enums
JSONEditor.defaults.resolvers.unshift(function(schema) {
if(schema.enumSource) return (JSONEditor.plugins.selectize.enable) ? 'selectize' : 'select';
if(schema.enumSource) return (JSONEditor.plugins.selectize.enable && !JSONEditor.plugins.selectize.multiArrayOnly) ? 'selectize' : 'select';
});
// Use the `enum` or `select` editors for schemas with enumerated properties
JSONEditor.defaults.resolvers.unshift(function(schema) {
Expand All @@ -289,7 +289,7 @@ JSONEditor.defaults.resolvers.unshift(function(schema) {
return "enum";
}
else if(schema.type === "number" || schema.type === "integer" || schema.type === "string") {
return (JSONEditor.plugins.selectize.enable) ? 'selectize' : 'select';
return (JSONEditor.plugins.selectize.enable && !JSONEditor.plugins.selectize.multiArrayOnly) ? 'selectize' : 'select';
}
}
});
Expand Down
1 change: 1 addition & 0 deletions src/editors/array/selectize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ JSONEditor.defaults.editors.arraySelectize = JSONEditor.AbstractEditor.extend({
this.container.appendChild(this.error_holder);

window.jQuery(this.input).selectize({
plugins: JSONEditor.plugins.selectize.remove_button ? ["remove_button"] : [],
delimiter: false,
createOnBlur: true,
create: true
Expand Down
5 changes: 2 additions & 3 deletions src/editors/object.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,8 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
}
// Normal layout
else {
container = document.createElement('div');
container = this.row_container;
container.innerHTML = '';
$each(this.property_order, function(i,key) {
var editor = self.editors[key];
if(editor.property_removed) return;
Expand All @@ -164,8 +165,6 @@ JSONEditor.defaults.editors.object = JSONEditor.AbstractEditor.extend({
row.appendChild(editor.container);
});
}
this.row_container.innerHTML = '';
this.row_container.appendChild(container);
},
getPropertySchema: function(key) {
// Schema declared directly in properties
Expand Down
Loading