Commit Graph

506 Commits

Author SHA1 Message Date
Dave Hughes 475dbc04b2 Fix minor typo in comment 2017-07-17 12:59:08 -07:00
jos 524d00e15e Fixed a bug in the sanitizer 2017-07-13 21:01:52 +02:00
jos 2046d98936 Released v5.9.1 2017-07-13 20:19:01 +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
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 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
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 a6bd4646ca Released v5.8.0 2017-07-02 14:32:00 +02:00
Israel Garcia 088d7d6c90 - Change signature of getOptions function to (text, path, input)
- Remove node object from exposure.
- Improve startFrom option by returning the start position.
2017-06-29 01:57:54 -04:00
Israel Garcia f71aa6c5b9 Restore code for showing asyc the autocomplete. 2017-06-19 12:39:15 -04:00
Israel Garcia 4036f5cd28 Remove activationChar, update documentation. 2017-06-19 12:03:15 -04:00
Israel Garcia 00ba443acf - polyfills moved to utils.js
- lowercase "Show" function
- refine autocomplete examples.
- style improvements to match context menu.
- set auto to scrollbar in autocomplete dropdownbox
- Added docs for Templates and Autocomplete
- Promisify getOptions function
- Add elementType to getOptions function to return which element "field" or "value" is being edited.
- applyTo option now accept ['field', 'value'] instead of ['name', 'value']
- optimize confirmKeys to be part of the autocomplete option instead of autocomplete.config
2017-06-16 20:19:56 -04:00
Israel Garcia fc4562fea1 restore onblur event for hide the dropdownbox 2017-05-31 19:44:51 -04:00
Israel Garcia df4cb21146 stylize as CSS classes, remove config inline styles. 2017-05-31 19:41:50 -04:00
Israel Garcia 0391ad11b4 adjust public methods to camelCase and refine examples. 2017-05-31 17:53:24 -04:00
Israel Garcia 5411ad19ac autocomplete integrated. 2017-05-26 03:58:16 -04:00
Israel Garcia ae287d48e9 Autocomplete integrated and 3 samples. 2017-05-26 03:32:01 -04:00
Israel Garcia 1b998c5b1a Renaming properties templates 2017-05-23 20:06:07 -04:00
Israel Garcia 1393b148db Autocomplete final refactory 2017-05-16 02:20:30 -04:00
Israel Garcia 131e8f106d custom autocomplete working 2017-05-15 00:31:20 -04:00
jos 0ddc9407b0 Updated history and example. Fixed bottom margin of submenu 2017-05-07 15:32:31 +02:00
Israel Garcia 3a9e55b3ae Support for Template Items 2017-05-05 04:36:13 -04: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 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 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
Xianming Zhong a768784643 Optimize the input experience of Chinese IME 2017-03-30 16:38:53 +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 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 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 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 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
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 e4073905a5 Fixed #308: wrong positioning of label "empty array" when `onEditable` returns false 2016-07-05 20:09:34 +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 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 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 8c3c476fe7 Fixed #299: reverted the fix of #268 by trimming text in fields and values 2016-05-22 14:59:37 +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 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 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 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 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
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 e7b7362fc2 Sorting object keys or array items via the context menu is now also naturally sorted (see #288) 2016-04-06 09:15:38 +02:00
jos a97be17ed3 Fixed #286: Calling `get()` or `getText()` caused the editor to lose focus. A regression introduced in v5.2.0 2016-04-04 22:13:19 +02:00
Jos de Jong 88be991ba3 Merge pull request #288 from edufelipe/sort-obj-keys
Add option to sort objects keys alphabetically
2016-04-04 21:50:40 +02:00
jos f18d4519f8 * Renamed Node.getPath to Node.getNodePath, and renamed Node.getFieldsPath to Node.getPath
* Fixed Node.getPath for Arrays
2016-04-04 21:44:08 +02:00
jos 8f7b656c3c Extended `util.parsePath` with support for all '*' 2016-04-04 21:28:23 +02:00
Eduardo Felipe Castegnaro 4819dcf250 Add option to sort objects keys alphabetically
The new option is disabled by default, but when enabled makes editing
large documents in tree or form mode much easier.
2016-04-01 00:22:32 -03:00
tdakanalis b5f43a7257 Handling Of Composite Types
Made a small fix in the handling of the oneOf, anyOf and allOf composite types
2016-03-31 15:32:44 +03:00
tdakanalis dd679542af Value Field Display Policy
When the enum is in a composite type then show both the select element and the edit value field, otherwise display only the select element.
2016-03-31 15:01:29 +03:00
tdakanalis 24c9440bbb Fixed the _getJsonObject
Added handling for the change event in the select input field
2016-03-31 14:37:28 +03:00
tdakanalis 266faef8a9 Display Enums As Drop Downs
The tree editor displays now the enum types with a drop down. The only you have to do is to define the enum values in the json schema and optionally the enumLabels with the labels for the respective values.

Example:

"properties": {
    "fruits": {
        "enum": ['orange', 'apple'],
        "enumLabels": ['Orange', 'Apple']
    }
}
2016-03-24 16:58:25 +02:00
jos f0afcea97d Fixed #283: improved JSON schema error message in case of no
additionalProperties
2016-03-24 08:43:26 +01:00
jos aeca44405e Released v5.2.0 2016-03-20 18:19:13 +01:00
jos d08e35797b Fixed #280: Some CSS issues when used in combination with bootstrap 2016-03-20 15:55:38 +01:00
jos a78b2ae57a Fixed #278: Implemented method `editor.destroy()` to properly cleanup the editor 2016-03-20 14:54:47 +01:00
jos 61c6f21f90 Fixed #268: JSONEditor now trims text in fields and values 2016-03-08 20:09:43 +01:00
jos 0432bd95f2 Fixed #272: Checkbox for boolean values visible in view mode 2016-02-15 20:35:19 +01:00
jos 2a4fa900e6 Fixed #264: Clicking items in the context menu not working on Firefox 2016-02-01 20:39:50 +01:00
Andrea Pinazzi 3201824d39 require Ajv module instead of Ajv compiled file 2016-01-21 16:05:49 +01:00
jos ec2511793a Fixed #259: when having a JSONEditor inside an HTML form, clicking an entry in the context menu did submit the form 2016-01-19 21:52:52 +01:00
jos f4492de1ca Fixed clicking format/compact not triggering an onChange event 2016-01-17 15:24:46 +01:00
jos 8ec471b6dc Improvements in sanitizing invalid JSON 2016-01-16 14:49:04 +01:00
jos ae2f4e923f Fixed #257: Improving error messages for enum errors failed when the schema contains references. 2016-01-16 10:46:43 +01:00
Miroslav Hibler ca21876fa3 Fixed error "Cannot read property 'clear' of undefined" thrown if search option set to `false`. 2016-01-15 20:22:39 +01:00
jos b4c02f9a3f Fixed #255: Removed wrong console warning about the option `search` 2016-01-15 19:41:51 +01:00
jos 5d3b005dc3 Released version 5.1.0 2016-01-14 21:26:39 +01:00
jos 1387169948 Improved error messaging for enums in code mode 2016-01-14 21:17:03 +01:00
jos e16770ebc2 Improved error messaging for enums 2016-01-14 21:10:30 +01:00
jos b26eb2ebe4 Fixed an issue with a horiziontal scrollbar popping with a popover on displayed on the right side 2016-01-14 20:04:45 +01:00
jos 5c51429abd Fixes in undo/redo of text input 2016-01-12 20:41:10 +01:00
jos e473209f1d Debouncing keyboard input implemented for fields too 2016-01-12 20:18:56 +01:00
jos f45fefe38f Implemented debouncing of keyboard input, resulting in much less history actions whilst typing 2016-01-12 18:11:56 +01:00
jos c0077250ef Fixed #222: editor throwing `onChange` events when switching mode 2016-01-12 17:25:33 +01:00
jos 68e22bb982 Keep brace json, searchbox, and theme-jsoneditor included in minimalist bundle 2016-01-12 16:42:55 +01:00
jos fbbdab9f02 Fixed #197: display an error in case of duplicate keys in an object 2016-01-12 16:28:40 +01:00
jos be40705cde Neatly resize the ace editor when validation errors are added/removed 2016-01-12 15:41:22 +01:00
jos 0690202f3a Implemented #183: display a checkbox left from boolean values, so you can easily switch between true/false. 2016-01-12 15:18:11 +01:00
jos 5a6ca406da Implemented support for JSON schema in mode text and code 2016-01-12 14:34:31 +01:00
jos 6463d717cf Fixed interfering shortcut keys: changed quick keys to select multiple fields from `Shift+Arrow Up/Down` to `Ctrl+Shift+Arrow Up/Down`. 2016-01-12 13:26:12 +01:00
jos 1d9d9c2594 Implemented method `setSchema` 2016-01-12 13:16:13 +01:00
jos 30eea90614 Added build script for minimalist version 2016-01-12 11:38:38 +01:00
jos 9daffa857d Move focus to invalid child node when clicking the error icon of it's parent nodes 2016-01-12 09:46:15 +01:00
jos 528c25e77a Removed util.log 2016-01-12 09:24:21 +01:00
jos 30fb043396 Allow passing `ajv` as configuration option 2016-01-12 09:21:41 +01:00
jos 54d2957f88 Implemented debouncing validation. Changed color of warning icon to yellow. 2016-01-12 08:56:28 +01:00
jos 4b5ac7434f Parent nodes now display an error when a child node is invalid 2016-01-11 17:06:12 +01:00
jos e21aad3e69 Basic JSON schema validation working 2016-01-11 15:44:03 +01:00
jos 593c6bd528 Fixed a bug in positioning of the context menu for multiple selected nodes 2015-12-31 15:04:32 +01:00
jos 7eb0803185 Fixed #130: option `onEditable` not available in mode `form` 2015-12-31 14:22:27 +01:00
jos 6b1c75b2c2 Fixed #104: context menus are now positioned relative to the elements of the editor instead of an absolute position in the window 2015-12-31 13:31:03 +01:00
jos 5955111b4d Fixed focus on mouse over 2015-12-31 10:05:57 +01:00
jos 0b3fc6956f Disable dragging multiple items when in mode view or form 2015-12-31 09:44:59 +01:00
jos 1fe49e0c39 Fixed not being able to select a single node 2015-12-30 22:20:15 +01:00
jos e372441542 Fixed jumping of selected nodes when dragging the lower down nodes 2015-12-30 21:39:49 +01:00
jos e90248c0d0 Some fixes in keyboard shortcuts to move a multi selection 2015-12-30 20:51:03 +01:00
jos 96c4204b1c Implemented keyboard shortcuts to select multiple fields 2015-12-30 20:29:45 +01:00
jos fe5a413f23 Minor css fix. Some internal refactoring. Updated history. 2015-12-30 17:38:05 +01:00
jos 5f99f09c0f Fixed dragging multiple nodes horizontally 2015-12-30 17:26:39 +01:00
jos d934992cdf Removed some leftover code 2015-12-30 16:11:22 +01:00
jos 8975101925 Fixed quick-keys Shift+Alt+Arrows not registering actions in history 2015-12-30 16:10:29 +01:00
jos d01fe7caab Dragging multiple nodes mainly working (few bugs left) 2015-12-30 15:01:14 +01:00
jos f88e3d6f0c Minor fix in _findTopLevelNodes 2015-12-30 11:23:22 +01:00
jos ceeb5e3357 Store/restore multiselection 2015-12-30 11:09:27 +01:00
jos a839043fd5 Implemented removing/duplicating multiple nodes 2015-12-30 10:28:18 +01:00
jos 353815bc61 Changed history to supporting inserting/removing/moving multiple nodes 2015-12-30 09:32:17 +01:00
jos ee027b2758 Multiple nodes can be selected visually, and have a specific contextmenu 2015-12-29 21:58:57 +01:00
jos 7ec8ea879f css fix 2015-12-28 12:51:33 +01:00
jos 862aa388c7 Fixed #242: row stays highlighted when dragging outside editor 2015-12-28 12:41:12 +01:00
jos b9c8c6a769 Fixed broken highlighting while dragging 2015-12-27 22:18:34 +01:00
jos ffcae51cd3 Fixed another css issue 2015-12-27 21:46:53 +01:00
jos 301e33983c Renamed all CSS classes They now have prefixes `.jsoneditor-` to prevent name collisions with css frameworks like bootstrap. 2015-12-27 21:43:18 +01:00
jos db0345c668 Styling of values in tree mode now customizable. Added a custom styling example 2015-12-27 17:36:59 +01:00
jos 2afe73a43a New design tweaks 2015-12-27 16:15:26 +01:00
jos 5ccfb909e6 New design 2015-12-25 16:48:15 +01:00
jos 2b671f1f5a Minor css tweak 2015-12-25 15:13:33 +01:00
jos a4c5190135 Renamed `.editor` to `.aceEditor` 2015-12-25 15:07:00 +01:00
jos 363974fe4c Minor improvement of expand in modes view/form 2015-12-25 14:47:39 +01:00
jos 95c1c4b0dd Fixed #203: Objects and arrays in mode `form` and `view` are now expandable by clicking the field names too. 2015-12-25 14:38:14 +01:00
jos fb4ec75d56 Changed setValue to clear 2015-12-25 14:01:01 +01:00
jos de314b897e Renamed options `change`, `editable`, `error` to respectively `onChange`, `onEditable`, and `onError`. Implemented `onModeChange` and `getMode`. 2015-12-25 11:38:41 +01:00
jos 75994c8035 Fixed #38: clear search results after a new JSON object is set 2015-12-25 10:45:28 +01:00
jos cafd4daba3 Implemented a new option `escapeUnicode`, which will show the hexadecimal unicode instead of the character itself. (See #93 and #230). 2015-12-24 20:20:50 +01:00
jos 0b234f6375 Some more fixes related to unicode and escape chars 2015-12-24 17:22:01 +01:00
jos 9cdff41afa Fixed #230: unicode characters are not escaped 2015-12-22 15:31:24 +01:00
jos dc40abf143 Fixed #230, Fixed #227, and Fixed #93: html and unicode characters not escaped 2015-12-21 14:39:15 +01:00
jos 547438664f Cleaned up left over console log 2015-12-21 13:44:01 +01:00
jos 75dd0821db Fixed #149: Memory leak when switching mode from/to `code` mode, web worker of Ace editor wasn't cleaned up 2015-12-21 13:42:27 +01:00
jos 0b3b23e92e disabled `Ctrl+L` quick key to go to a line, instead use the default browser behavior of selecting the address bar. 2015-12-21 13:24:37 +01:00
jos 03c82ba38f Upgraded to brace v0.7.0 2015-12-21 13:15:59 +01:00
Isaiah Odhner b03e9cedc4 Use pseudo-elements for field/value placeholders 2015-12-12 11:41:05 -05:00
Isaiah Odhner 65fc58005c Use SVG for icons 2015-12-11 22:35:57 -05:00
jos 277bb185d5 Fixed #234: Remove dependency on a fork of the `jsonlint` project on github 2015-11-07 19:20:19 +01:00
Jason Marshall a41ff76c56 Add an 'onMode' callback option which is invoked after setMode finishes. 2015-09-17 15:05:11 -07:00
jos 36fa3c40df Fixed #161: Added `consolas` font to solve a text selection issue on chinese machines 2015-06-13 11:14:00 +02:00
jos 8416944f5c Fixed `editor.get()` manipulating the code when containing an error (see #191) 2015-05-14 21:18:14 +02:00
jos a7f41b8ef5 Implemented option `ace` to provide a custom version of the Ace editor. (see #173, #176) 2015-05-14 21:06:03 +02:00
Nuno Santos 8bab1158bf Support for custom themes. 2015-03-18 10:34:51 +01:00
jos 053f4f5113 Released version 4.1.3, fixes for browserify 2015-03-17 20:25:50 +01:00
jos 45b1941f95 Released version 4.1.0 2015-03-15 15:11:36 +01:00
jos fcfac08fc3 Implemented function `focus()` for tree, view, and form mode. 2015-03-02 20:51:03 +01:00
jos 75372fa3d7 More unit tests and a refinement of the regexp to remove JSONP encapsulation 2015-02-28 17:03:40 +01:00
jos b94b87c66b Fixed bugs in the JSON sanitizer, no longer manipulating comments or JSON-like structures inside strings. 2015-02-28 16:54:34 +01:00
jos 0962067ca9 Replaced some equality checks with strict equality checks 2015-02-28 15:36:56 +01:00
jos 6f5ea96d1a A bundle can be created excluding Ace editor 2015-02-28 15:21:01 +01:00
jos 86e15f74e2 Added some unit tests 2015-02-28 15:04:46 +01:00
jos d948cdcd7c Fixed loading jsoneditor theme in Ace editor 2015-02-27 22:30:06 +01:00
jos 2c9b7e9c7b Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	jsoneditor.js
	jsoneditor.map
	jsoneditor.min.js
	src/js/util.js
2015-02-27 22:21:06 +01:00
jos 629ed49e7d Fixed a broken require. 2015-02-27 22:16:05 +01:00
jos 0db2c35c2b Using brace to load Ace. Ace and jsonlint are now packed by default with JSONEditor. Removed all redundant build stuff for the assets. 2015-02-27 21:54:04 +01:00
jos c18145f503 Reworked the source code to commonjs modules 2015-02-27 21:17:19 +01:00
Yaniv Efraim 03292d9e85 Feature #144 improved regex for stripping JSONP 2015-02-13 11:41:02 +02:00
Yaniv Efraim 57691e5cb6 feature #144 - fixed an issue (stripping comments wasn't working) 2015-02-11 22:04:54 +02:00
Yaniv Efraim 3f8d10daaa Feature #144
1. Remove code comments from JSON
2. Strip JSONP to become a JSON object
2015-02-11 21:50:17 +02:00
Yaniv Efraim d99d899648 Feature #144 change regex to match newlines as well 2015-02-11 21:50:17 +02:00
Yaniv Efraim e4c56574cf feature #144 2015-02-11 21:50:17 +02:00
jos 376fc272ce Released version 3.2.0 2015-01-25 15:11:56 +01:00
jos 3f6f5d2a70 Fixed configured indentation not being applied to Ace editor (see #158) 2015-01-25 15:05:07 +01:00
jos 82e4627e0e Fixed #154: Implemented shortcut keys to format and compact JSON when in mode `text` or `code`. 2015-01-23 10:39:12 +01:00
jos 66f41d87fd Merge branch 'master' into develop 2014-10-20 21:20:41 +02:00
Tomek Wytrebowicz 8c4162f0bb Use `""` as valid path in JSON - fix for josdejong/jsoneditor#138 2014-10-18 01:59:24 +02:00
jos 2c84da0998 a css fix for firefox 2014-10-09 15:29:17 +02:00
jos 330e5bb6d1 Fixed #129: code is sanitized before throwing an error 2014-09-13 10:04:55 +02:00
jos b0a1795c12 Some simplifications in parseJS 2014-08-01 09:46:50 +02:00
jos 8ca4c75326 Some more fixes in `parseJS` 2014-08-01 09:33:00 +02:00
jos fada177c4a Fixed `parseJS` not being able to parse a single quoted string to JSON 2014-08-01 09:06:54 +02:00
jos fb16ec4586 Replaced parsing of JavaScript objects into JSON from `eval` to a dedicated `parseJS` function 2014-08-01 08:49:06 +02:00
jos ca84b340bd Fixed: shortcut keys to manipulate the nodes are now disabled when mode is `form` or `view`. 2014-07-28 20:56:19 +02:00
jos 1671dc7da7 Documented `editable` option 2014-07-28 08:45:31 +02:00
jos 24bc21e00a Oops... uncommented try/catch again 2014-07-27 21:09:33 +02:00
jos b947e868eb Improved the `editable` callback: now also provides the path to a node and the nodes value 2014-07-27 21:08:59 +02:00
jos 1133024ae7 Implemented setting editable/readonly nodes individually via config function `editable` 2014-07-27 15:46:42 +02:00
jos c72ea9b6e1 Fixed #111: accept JavaScript objects as input, and turn them into valid JSON 2014-07-26 15:01:53 +02:00
jos 09fe8169d0 Fixed an error in registerMode 2014-05-30 21:28:40 +02:00
jos 459c2681ec Improved registerMode and setMode 2014-05-30 11:33:15 +02:00
jos 0c1331ba12 Changed TreeEditor and TextEditor into mixins for JSONEditor 2014-05-30 10:53:57 +02:00
jos d6da7f548e Refactored JSONEditor sourcecode to AMD modules 2014-05-29 22:13:37 +02:00
jos 6eea2b6335 Renamed files to match the contained prototype 2014-05-29 18:51:17 +02:00
jos 282dc4f7ac Moved sourcecode from `/jsoneditor` to `/src` 2014-05-29 18:42:14 +02:00