Commit Graph

168 Commits

Author SHA1 Message Date
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