Skip to content

Commit

Permalink
Add jshint to grunt build process.
Browse files Browse the repository at this point in the history
Remove CustomEvents check in utilities. Fixes jdorn#131
Add support for SCEditor initialization options.
Bug fix in Class implementation checking for function toString support.
  • Loading branch information
jdorn committed Jun 8, 2014
1 parent b599c8d commit fe81013
Show file tree
Hide file tree
Showing 25 changed files with 334 additions and 169 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
dist/* merge=own
40 changes: 39 additions & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,53 @@ module.exports = function(grunt) {
files: ["src/**/*.js"],
tasks: ["concat"]
}
},
jshint: {
beforeconcat: [
'src/class.js',
'src/ie9.js',

// Utils like extend, each, and trigger
'src/utilities.js',

// The main JSONEditor class
'src/core.js',

// JSON Schema validator
'src/validator.js',

// All the editors
'src/editor.js',
'src/editors/*.js',

// All the themes and iconlibs
'src/theme.js',
'src/themes/*.js',
'src/iconlib.js',
'src/iconlibs/*.js',

// The JS templating engines
'src/templates/*.js',

// Set the defaults
'src/defaults.js',

// Wrapper for $.fn style initialization
'src/jquery.js'
],
afterconcat: [
'dist/jsoneditor.js'
]
}
});

// These plugins provide necessary tasks.
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-watch');
grunt.loadNpmTasks('grunt-contrib-jshint');

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

};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "json-editor",
"version": "0.6.11",
"version": "0.6.12",
"authors": [
"Jeremy Dorn <[email protected]>"
],
Expand Down
Loading

0 comments on commit fe81013

Please sign in to comment.