Commit Graph

1123 Commits

Author SHA1 Message Date
Israel Garcia 3a9e55b3ae Support for Template Items 2017-05-05 04:36:13 -04:00
Israel Garcia 38ce7760dd Support for Template items 2017-05-05 04:33:38 -04:00
jos 56c450bf0f Released v5.6.0 2017-04-15 12:28:46 +02:00
jos 09c1375c84 Fixed not being able to move focus to a enum select box when clicking a JSON Schema warning 2017-04-15 12:21:41 +02:00
jos 0adf824f5b Merge remote-tracking branch 'origin/develop' into develop 2017-04-15 11:51:56 +02:00
jos fd91632904 Merge branch 'master' into develop 2017-04-15 11:51:49 +02:00
jos 3d2bf6bd48 Updated text 2017-04-14 14:34:31 +02:00
jos fcecb3fc2a Updated text 2017-04-14 14:32:03 +02:00
jos 77b7e10220 Updated text 2017-04-14 14:21:10 +02:00
jos 66dced1dd3 Fixed image? 2017-04-14 14:17:15 +02:00
jos 0007ee8de4 Added images again 2017-04-14 14:16:01 +02:00
jos fe3dffacf3 Drop broken images 2017-04-14 14:13:58 +02:00
jos d258167837 Renamed images 2017-04-14 14:11:35 +02:00
jos ac7ec05d1d Switched to png image instead of svg 2017-04-14 14:10:07 +02:00
jos d152aea2ad Switched to png image instead of svg 2017-04-14 14:09:47 +02:00
jos 23b5b301c6 Fixed broken link 2017-04-14 14:08:22 +02:00
jos b26024b6e3 Merge remote-tracking branch 'origin/master' 2017-04-14 14:06:47 +02:00
jos e497f54f6d Added link to BrowserStack 2017-04-14 14:06:25 +02:00
Jos de Jong eadf5c6403 Merge pull request #383 from walkerrandolphsmith/develop
#382 Read only text mode.
2017-04-12 21:08:57 +02:00
Walker Randolph Smith c0b7139fd2 #382 Rename example file. 2017-04-12 11:51:50 -04:00
Walker Randolph Smith 3539f40dc5 #382 Support read only code mode. 2017-04-12 11:51:50 -04:00
Walker Randolph Smith c29bcba5ff #382 typo on typeof function check 2017-04-12 11:51:50 -04:00
Walker Randolph Smith 2c72173366 #382 Read only text mode. 2017-04-12 11:51:50 -04:00
Jos de Jong cfc5a805e7 Merge pull request #381 from chinesedfan/fix_bkgcolor
Optimize the input experience of Chinese IME
2017-04-04 22:00:14 +02:00
Jos de Jong 1265ed78a9 Merge pull request #380 from chinesedfan/upgrade_ace
Fixed #253: upgrade ace to 1.2.6
2017-04-04 21:57:39 +02:00
Xianming Zhong a768784643 Optimize the input experience of Chinese IME 2017-03-30 16:38:53 +08:00
Xianming Zhong f5edad2d31 Fixed #253: upgrade ace to 1.2.6 2017-03-30 14:23:16 +08:00
jos e1f686b8e5 Fixed #368: Mode selection drop down not fully visible on small screen 2017-02-26 20:40:12 +01:00
Jos de Jong 6b5b54052c Merge pull request #355 from isonet/master
Suggesting a different directive for Angular.js.
2017-01-21 21:12:35 +01:00
Paul Biester 4bde72f7cf Suggesting a different directive for Angular.js. 2017-01-18 09:13:37 +01:00
jos 717ed48474 Fixed #309: already loaded version of Ace being overwritten by the embedded version of JSONEditor 2017-01-06 21:46:23 +01:00
jos 3117789ed7 Released v5.5.11 2017-01-06 20:58:19 +01:00
jos 2f4f221c9a Better fix for #347 (earlier fix introduced other CSS issues) 2017-01-06 20:56:03 +01:00
jos 74b9aaf5fa Fixed #347: CSS more robust against global settings of div position 2017-01-03 20:43:43 +01:00
jos 1c8ea64c2a Fixed #54: CSS more robust against global settings of div position 2017-01-03 20:43:10 +01:00
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