StardewValley
/
jsoneditor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,127 Commits 9 Branches 163 Tags 52 MiB
Commit Graph

506 Commits

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