Commit Graph

1104 Commits

Author SHA1 Message Date
Thiago Bovi de Mendonca 6689759793 Add extra verification when creating JSON editor to avoid to look for an element in an empty array 2017-08-20 22:06:34 +03:00
jos 308f3b2bde Released v5.8.2 2017-08-20 22:06:34 +03:00
jos ea6b71986c Cleanup some unused code. Minor update in the readme and examples 2017-08-20 22:06:34 +03:00
Israel Garcia 3654e46f08 - move 'editor' parameter to the last position
- send standard array path instead of jsonpath in getOptions
2017-08-20 22:06:34 +03:00
Israel Garcia 97891621e3 return jsonpath in getOptions and editor instance. 2017-08-20 22:06:34 +03:00
jos 694e766fbf Drop package-lock for now, revert to using npm v4 2017-08-20 22:06:34 +03:00
jos 84ab5107dd Updated history 2017-08-20 22:06:34 +03:00
Owen Garland a9584e015f Enabled the default mode to be set when using a list of available modes. 2017-08-20 22:06:34 +03:00
jos a0f317d1d6 Released v5.9.4 2017-08-20 20:40:08 +02:00
Jos de Jong 9ee8700661 Merge pull request #448 from tomalec/issues/447-modes-in-shadow-dom
Add listeners to list (shadow) root instead of window,
2017-08-20 20:37:22 +02:00
Tomek Wytrebowicz 63c0689a61 Remove event listeners from (shadow) root instead of window,
make context menus work in Shadow DOM.

Fixes https://github.com/josdejong/jsoneditor/issues/447
2017-08-20 15:26:44 +02:00
Tomek Wytrebowicz b1a939d680 Add listeners to list (shadow) root instead of window,
make context menus work in Shadow DOM.

Fixes https://github.com/josdejong/jsoneditor/issues/447
2017-08-17 20:51:20 +02:00
Israel Garcia 1651c50c01 Merge pull request #2 from josdejong/develop
Merge Develop to Develop
2017-08-17 13:03:45 -04:00
jos c51db94f88 Released version 5.9.3 2017-07-24 11:56:21 +02:00
jos 06bbf2d1a5 Neatly wrap long text of context menu 2017-07-24 11:37:43 +02:00
jos 6ad7552c3e Merge remote-tracking branch 'origin/develop' into develop 2017-07-24 10:07:13 +02:00
jos 2110d251bb Fixed broken multi-selection 2017-07-24 10:07:00 +02:00
Jos de Jong b69d52a46b Merge pull request #439 from dhughes-xumak/defect/minor-treemode-comment-typo
Fix minor typo in comment
2017-07-18 21:18:23 +02:00
Dave Hughes 6b1546f803 Fix minor typo in comment 2017-07-18 12:15:46 -07:00
Jos de Jong 595c4f48df Merge pull request #436 from dhughes-xumak/defect/minor-treemode-comment-typo
Fix minor typo in comment in treemode.js
2017-07-18 21:11:18 +02:00
Dave Hughes 475dbc04b2 Fix minor typo in comment 2017-07-17 12:59:08 -07:00
jos f6e699e4cc Released v5.9.2 2017-07-13 21:02:38 +02:00
jos 524d00e15e Fixed a bug in the sanitizer 2017-07-13 21:01:52 +02:00
jos 3e4c975b70 Merge remote-tracking branch 'origin/master' 2017-07-13 20:19:27 +02:00
jos 2046d98936 Released v5.9.1 2017-07-13 20:19:01 +02:00
Jos de Jong 860aa31ddb Reordered browserstack info 2017-07-12 10:09:55 +02:00
jos a00ec59241 Released v5.9.0 2017-07-10 20:05:13 +02:00
jos 22fb4ca501 Merge remote-tracking branch 'origin/develop' into develop 2017-07-10 19:58:41 +02:00
jos 7ac3f5aee6 Fixed JSONEditor picking the first entry of `modes` as initial mode instead of option `mode` 2017-07-10 19:58:34 +02:00
Jos de Jong ccb9ea6d94 Merge pull request #423 from meirotstein/master
add support for json schema references ($ref)
2017-07-10 19:57:59 +02:00
Jos de Jong 15ed4da608 Merge pull request #428 from trystan2k/bugfix/incorrectConditionOnModesArray
Add extra verification when creating JSON editor to avoid to look for…
2017-07-10 19:47:15 +02:00
Thiago Bovi de Mendonca e8684d7d42 Add extra verification when creating JSON editor to avoid to look for an element in an empty array 2017-07-10 10:21:33 +02:00
Meir Rotstein 0b9c1f8d34 Set schemaRefs as optional parameter of setSchema() and remove setSchemaRefs() 2017-07-10 10:32:13 +03:00
jos b84621d054 Released v5.8.2 2017-07-08 11:51:48 +02:00
jos ee85fb099d Cleanup some unused code. Minor update in the readme and examples 2017-07-08 11:48:32 +02:00
Jos de Jong ea06b877b8 Merge pull request #426 from israelito3000/improvements/autocomplete
Improvements/autocomplete
2017-07-08 11:43:34 +02:00
Israel Garcia 495ed38063 - move 'editor' parameter to the last position
- send standard array path instead of jsonpath in getOptions
2017-07-07 13:43:15 -04:00
Israel Garcia d423a70a5d return jsonpath in getOptions and editor instance. 2017-07-06 22:26:25 -04:00
jos fec677883b Drop package-lock for now, revert to using npm v4 2017-07-05 22:12:58 +02:00
jos 3e7a7c08f0 Updated history 2017-07-05 22:12:37 +02:00
Jos de Jong 6d56b1ba76 Merge pull request #424 from bag-man/feature/default-mode-from-list
Enabled the default mode to be set when using a list of available modes.
2017-07-05 22:10:08 +02:00
Israel Garcia f9d8a039e2 merge from upstream 2017-07-05 12:10:59 -04:00
Owen Garland f6f2fce422 Enabled the default mode to be set when using a list of available modes. 2017-07-05 16:32:04 +02:00
Meir Rotstein b77deb969c add support for json schema references ($ref) 2017-07-05 00:28:28 +03:00
jos 3a8aa1755c Released v5.8.1 2017-07-03 19:23:32 +02:00
jos a6bd4646ca Released v5.8.0 2017-07-02 14:32:00 +02:00
jos 5559b0d417 Updated history 2017-07-02 13:45:06 +02:00
jos 0aed6e481e Some updates in the examples (indentation, link to jsonpath library instead of including it) 2017-07-02 13:44:08 +02:00
jos 02555b8510 Some updates in the docs 2017-07-02 13:43:10 +02:00
Jos de Jong 1f29f5912a Merge pull request #407 from israelito3000/feature/autocomplete2
Feature/autocomplete2
2017-07-02 13:23:55 +02:00