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.

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

Feature/fix disable collapse #713

Closed
wants to merge 38 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
bead6d4
add watch task
Oct 12, 2016
65ad3a9
add option remove_empty_array
Oct 12, 2016
3d14a97
pass isArray param to theme
Oct 19, 2016
085ea70
change switch structure
Oct 19, 2016
01cf2a8
add class to switch holder
Oct 19, 2016
f99c006
remove text from remove button
Oct 19, 2016
8b21dd2
add button with text and icon
Oct 19, 2016
e638f07
new upload part 1
Oct 20, 2016
eff8299
add class for array buttons
Oct 20, 2016
c2a3cdd
enable and disable preview buttons
Oct 20, 2016
8d8d438
upload bar
Oct 24, 2016
7808465
fix delete progress bar
Nov 10, 2016
ee9db22
fix popover image preview
Nov 10, 2016
7df66e0
add class to button row
Nov 10, 2016
7cb52da
use title in validation errors
Nov 12, 2016
addc0f8
validation url
Nov 29, 2016
17334a6
remove html5 input type
Nov 29, 2016
5cfd097
hide validation error
Nov 29, 2016
edb76f5
error messages
Nov 29, 2016
0b791b6
add show_all_properties
Nov 29, 2016
0f72cf0
collapse in click title
Nov 30, 2016
a202b8b
enable disable select2
Dec 1, 2016
ff6ca65
fix collapse
Dec 6, 2016
ccf6981
watch as placeholder
Dec 8, 2016
19bfa2c
fix readonly field
Dec 8, 2016
3f4a33f
fix placeholder Watch
Dec 8, 2016
d6ae678
add stringWhiteLabel
Dec 8, 2016
3fbdb69
add required class to strings
Dec 11, 2016
2a4b7f6
static url
Dec 14, 2016
5493d93
isEmpty
Dec 14, 2016
d48cdca
remove unserscoreCase options
Dec 14, 2016
c1d8695
fix isEmpty
Dec 14, 2016
0758263
fix jshint errors
jminuscula Jan 9, 2017
fd33b29
fix jump validation
jminuscula Jan 9, 2017
d5a06db
allow showInput for upload fields
jminuscula Jan 9, 2017
c11d686
Merge pull request #1 from androidsx/feature/upload-show-input
jminuscula Jan 9, 2017
1b1e056
add input placeholder option (#2)
jminuscula Jan 9, 2017
64c96b9
fix disable collapse
Jan 10, 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
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,5 +140,5 @@ module.exports = function(grunt) {

// Default task.
grunt.registerTask('default', ['jshint:beforeconcat','concat','jshint:afterconcat','uglify']);

grunt.registerTask('dev', ['watch']);
};
13 changes: 9 additions & 4 deletions demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ <h2>Code</h2>
type: "string",
description: "First and Last name",
minLength: 4,
default: "Jeremy Dorn"
default: "Jeremy Dorn",
readonly: true,
},
age: {
type: "integer",
Expand Down Expand Up @@ -209,10 +210,13 @@ <h2>Code</h2>
citystate: {
type: "string",
description: "This is generated automatically from the previous two fields",
template: "{{city}}, {{state}}",
template: "{{city}}",
watch: {
city: 'location.city',
state: 'location.state'
},
options:{
unserscoreCase: true,
placeholderWatch: true
}
}
}
Expand Down Expand Up @@ -286,7 +290,8 @@ <h2>Code</h2>
if(jsoneditor) jsoneditor.destroy();
jsoneditor = new JSONEditor($editor,{
schema: schema,
startval: startval
startval: startval,
remove_empty_array: true
});
window.jsoneditor = jsoneditor;

Expand Down
Loading