Fixed #186: binding issue to `jsonlint.parse`.

This commit is contained in:
jos 2015-05-07 11:45:12 +02:00
parent 999a253803
commit 7c62f5a97d
6 changed files with 24 additions and 28 deletions

View File

@ -7,6 +7,7 @@ https://github.com/josdejong/jsoneditor
- Implemented option `theme`, allowing to set a custom theme for the Ace - Implemented option `theme`, allowing to set a custom theme for the Ace
editor. Thanks @nfvs. editor. Thanks @nfvs.
- Fixed #186: binding issue to `jsonlint.parse`.
## 2015-03-15, version 4.1.1 ## 2015-03-15, version 4.1.1

7
dist/jsoneditor.js vendored
View File

@ -24,7 +24,7 @@
* *
* @author Jos de Jong, <wjosdejong@gmail.com> * @author Jos de Jong, <wjosdejong@gmail.com>
* @version 4.1.3 * @version 4.1.3
* @date 2015-03-17 * @date 2015-05-07
*/ */
(function webpackUniversalModuleDefinition(root, factory) { (function webpackUniversalModuleDefinition(root, factory) {
if(typeof exports === 'object' && typeof module === 'object') if(typeof exports === 'object' && typeof module === 'object')
@ -1145,6 +1145,7 @@ return /******/ (function(modules) { // webpackBootstrap
'Falling back to plain text editor'); 'Falling back to plain text editor');
} }
} }
this.theme = options.theme || 'ace/theme/jsoneditor';
var me = this; var me = this;
this.container = container; this.container = container;
@ -1218,7 +1219,7 @@ return /******/ (function(modules) { // webpackBootstrap
this.content.appendChild(this.editorDom); this.content.appendChild(this.editorDom);
var editor = ace.edit(this.editorDom); var editor = ace.edit(this.editorDom);
editor.setTheme('ace/theme/jsoneditor'); editor.setTheme(this.theme);
editor.setShowPrintMargin(false); editor.setShowPrintMargin(false);
editor.setFontSize(13); editor.setFontSize(13);
editor.getSession().setMode('ace/mode/json'); editor.getSession().setMode('ace/mode/json');
@ -6832,7 +6833,7 @@ return /******/ (function(modules) { // webpackBootstrap
})(); })();
if (true) { if (true) {
exports.parser = jsonlint; exports.parser = jsonlint;
exports.parse = jsonlint.parse; exports.parse = jsonlint.parse.bind(jsonlint);
} }
/***/ }, /***/ },

2
dist/jsoneditor.map vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -22,7 +22,7 @@
}, },
"dependencies": { "dependencies": {
"brace": "^0.4.1", "brace": "^0.4.1",
"jsonlint": "josdejong/jsonlint#fb47330" "jsonlint": "josdejong/jsonlint#85a19d7"
}, },
"devDependencies": { "devDependencies": {
"gulp": "^3.8.11", "gulp": "^3.8.11",