Commit Graph

588 Commits

Author SHA1 Message Date
jos 94ca26e457 Fixed a styling issue with Ace search box 2017-01-03 20:36:08 +01:00
jos 8dc4752872 Fixed embedded version of jsoneditor ace theme not being loaded in minimalist version. Added docs and example on loading a custom Ace editor (see #55) 2017-01-03 20:23:03 +01:00
jos 4bc339f6fe Released v5.5.10 2016-11-02 21:03:18 +01:00
jos df12832a6b Fixed #85: pressing enter in an input in a form containing a JSONEditor too breaks submitting the form 2016-11-01 21:00:21 +01:00
jos d73665acf3 Released v5.5.9 2016-10-17 21:16:01 +02:00
jos 8913ce1f6f Fixed #329: Editor showing duplicate key warnings for keys defined on the Object prototype, like `toString` and `watch` 2016-10-15 10:49:44 +02:00
jos cee259f2a5 Released v5.5.8 2016-09-27 21:07:31 +02:00
jos 4aa9e7db7f Updated history 2016-09-24 19:23:31 +02:00
Jos de Jong b4c9417b7a Merge pull request #326 from nprdm/master
Fix https://github.com/josdejong/jsoneditor/issues/314
2016-09-24 19:20:51 +02:00
Stephen Thompson fe459e64c3 Update built artifacts with fix from 48408f4ded 2016-09-22 18:25:27 -04:00
Stephen Thompson 48408f4ded Fix https://github.com/josdejong/jsoneditor/issues/314
The JSON path parsing code assumes that string keys within square brackets in JSON paths will be valid, parseable JSON.

However, the ajv library on which this project depends emits string keys in single quotes.

For example, ajv can emit .foo['bar'], which will ultimately end up with a call to JSON.parse("'bar'"). This causes the "Unexpected token ' in JSON at position 0" error thrown from JSON.parse.

 Since ajv shouldn't need to change and since this utility is gone in the next branch, this fix checks for ajv-formatted string keys and patches them to double-quoted strings before calling JSON.parse. This is the narrowest fix for the problem.
2016-09-22 18:06:22 -04:00
jos 02f81ea8de Released v5.5.7 2016-08-17 21:29:14 +02:00
jos e4073905a5 Fixed #308: wrong positioning of label "empty array" when `onEditable` returns false 2016-07-05 20:09:34 +02:00
jos 91d9bc6903 Released version 5.5.6 2016-06-15 19:35:28 +02:00
jos c2c7dd5adf Fixed #303: editor contents collapsed when the parent div of the JSONEditor has no height set 2016-06-06 21:25:45 +02:00
jos 410dffbce7 Updated history 2016-06-06 21:11:31 +02:00
Jos de Jong 45be754de8 Merge pull request #305 from RDCH106/master
Added save dialog to example 4
2016-06-06 21:09:18 +02:00
Rubén de Celis Hernández 9bf3e37153 Added save dialog 2016-06-03 19:32:21 +02:00
jos f084180730 Released v5.5.5 2016-05-24 19:54:56 +02:00
jos c8de51d03f Fixed #298: Switch mode button disappears when switching from text/code to tree/form/view mode when the JSON contained errors 2016-05-23 21:27:34 +02:00
jos 67823c6642 Some code reorganization 2016-05-23 21:09:04 +02:00
jos f7c9b7d9ff Some code reorganization 2016-05-23 20:52:00 +02:00
jos b67d683f1a Fixed enum drop downs not working when the JSONEditor is configured with a name (see #285) 2016-05-23 20:35:24 +02:00
jos b18537f976 Released v5.5.4 2016-05-22 20:43:26 +02:00
jos b11dc3038f Fixed nodes being multi-selected when selecting an enum drop down 2016-05-22 20:40:17 +02:00
jos 40c1b887e7 Fixed a (harmless) error in the console when clicking right from an enum drop down 2016-05-22 20:19:19 +02:00
jos b922aceb07 Fixed #285: an issue with the enum drop down when having defined multiple enums in a JSON schema 2016-05-22 20:14:50 +02:00
jos 60b7b17511 Released v5.5.3 2016-05-22 15:12:28 +02:00
jos 8c3c476fe7 Fixed #299: reverted the fix of #268 by trimming text in fields and values 2016-05-22 14:59:37 +02:00
jos 7d283f1b90 Released v5.5.2 2016-04-18 20:44:00 +02:00
jos e8092db9b4 Fixed #294: Fields reset their caret location on every key press in Firefox 2016-04-18 20:41:07 +02:00
jos 0557db02f2 Released v5.5.1 2016-04-16 12:40:29 +02:00
jos 444d2b3631 Fixed enum select boxes not being rendered/removed when setting or removing a JSON schema via `editor.setSchema(schema)` 2016-04-16 12:36:14 +02:00
jos a78b99f71d Released v5.5.0 2016-04-16 10:43:43 +02:00
jos 309e8f9bc2 Updated history and bootstrap test file 2016-04-11 21:42:38 +02:00
Jos de Jong 81829c9dac Merge pull request #292 from nucleartide/master
Fix context menu CSS when used with Bootstrap.
2016-04-11 21:40:21 +02:00
jos 7e7c7bdf77 Updated history 2016-04-11 20:18:02 +02:00
Jos de Jong 953acd2055 Merge pull request #285 from tdakanalis/feature/enumAsDropDownMenus
Display Enums As Drop Downs
2016-04-11 20:15:01 +02:00
Jason Tu 3be456c783 Fix context menu CSS when used with Bootstrap. 2016-04-11 12:02:39 -04:00
tdakanalis 3c73a9e160 -Removed some mistakenly committed debugger statemets. 2016-04-11 10:00:15 +03:00
tdakanalis a785de2930 -Fixed some accidentally removed logic. 2016-04-11 09:56:16 +03:00
tdakanalis 1dadc5f465 -Removed the ability to use the non standard json schema element 'enumLabels' in order to define the labels of the drop downs. The values will be used instead. This feature will be re-implemented using the tree editor's options. 2016-04-11 09:42:47 +03:00
jos 42fe532975 Released v5.4.0 2016-04-09 21:00:33 +02:00
jos ea473c54aa Fixed #289: Some CSS breaking when using the editor in combination with materialize.css or bootstrap 2016-04-09 20:55:07 +02:00
jos 96304f83a7 Fixed #290: `setText()` not working in mode text or code 2016-04-09 20:11:41 +02:00
jos 4950d6fc39 Changed all code to strict mode (`'use strict'`) 2016-04-09 20:10:18 +02:00
jos 1d97297486 Upgraded all dependencies 2016-04-09 20:06:29 +02:00
tdakanalis 30c7f7c8f3 -Fixed the re-rendering of the drop down element when the field name changes 2016-04-07 10:51:49 +03:00
tdakanalis d1d9ce6135 Merge branch 'develop' into feature/enumAsDropDownMenus 2016-04-07 09:08:52 +03:00
jos 2a2ae53562 Released v5.3.0 2016-04-06 09:25:05 +02:00