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

1381 Commits

Author SHA1 Message Date
jos 514f015041 Some simplifications in the build file 2015-02-28 21:10:19 +01:00
jos d9939177dd Moved images also to /dist 2015-02-28 21:02:39 +01:00
jos 12214f930a Moved the distribution files from root to the ./dist folder 2015-02-28 20:47:23 +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 1dea979c99 Updated readme 2015-02-28 15:30:26 +01:00
jos 68a1083a64 Updated readme 2015-02-28 15:23:19 +01:00
jos 6f5ea96d1a A bundle can be created excluding Ace editor 2015-02-28 15:21:01 +01:00
jos 95d74234d4 Added some unit tests for JSON sanitizing 2015-02-28 15:06:44 +01:00
jos 86e15f74e2 Added some unit tests 2015-02-28 15:04:46 +01:00
jos e7cfd2c05d Updated history 2015-02-27 22:53:45 +01:00
jos d948cdcd7c Fixed loading jsoneditor theme in Ace editor 2015-02-27 22:30:06 +01:00
jos a114537036 Updated built files 2015-02-27 22:21:31 +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
Jos de Jong 1a5ea41e77 Merge pull request #164 from yanivefraim/develop 
Feature #144
 2015-02-13 09:51:58 +00:00
Yaniv Efraim 7bb6b6d223 feature #144 - remove comments from build code 2015-02-13 11:45:43 +02: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 abc3ac3625 Fixed #163: updated npm dependencies 2015-02-10 22:14:45 +01:00
jos 6653021fd8 Added a CONTRIBUTING.md file 2015-02-10 21:41:47 +01:00
jos 63e61dd817 Merge remote-tracking branch 'origin/master' 2015-01-25 15:12:20 +01: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 f1e49c2ad0 Merge remote-tracking branch 'origin/develop' into develop 2015-01-23 10:39:24 +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 de Jong 4d8d1c72fa Merge pull request #152 from hhzl/master 
file name is jsoneditor.min.js
 2014-12-22 10:47:14 +01:00
Hannes Hirzel 1ac05f41ac file name is jsoneditor.min.js 2014-12-21 18:34:58 +00:00
Jos de Jong 19cbdd03f7 Merge pull request #147 from DeanPoulin/develop 
Included jsoneditor.css as a Main Component
 2014-11-13 19:43:24 +01:00
Dean Poulin 3348dfc096 Included jsoneditor.css as a Main Component 
Added the css file to bower so that the css will be identified as a main component used. Making this change allows gulp to identify the css and inject it into the project automatically at build time.

Executing the following shell commands:

    yo gulp-angular
    bower install jsoneditor --save
    gulp build

will result in the index.html automatically being injected as seen below:

    <!-- bower:css -->
    <link rel="stylesheet" href="../bower_components/jsoneditor/jsoneditor.css" />
    <!-- endbower -->
    <!-- endbuild -->

    <!-- build:js scripts/vendor.js -->
    <!-- bower:js -->
    <script src="../bower_components/jsoneditor/jsoneditor.min.js"></script>
    <!-- endbower -->
    <!-- endbuild -->
 2014-11-13 13:31:02 -05:00
jos 66f41d87fd Merge branch 'master' into develop 2014-10-20 21:20:41 +02:00
Jos de Jong 75647308da Merge pull request #139 from tomalec/138-emptyStringPath 
Use `""` as valid path in JSON
 2014-10-20 21:18:32 +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 cc1b12effc Updated version number to 3.1.3-SNAPSHOT 2014-09-03 12:02:05 +02:00
jos b03dd76c81 Released version 3.1.2 2014-09-03 11:54:08 +02:00
jos 14db0632c2 Fixed #126: lack of a semi colon at end of the bundled files 2014-08-28 21:20:14 +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 2662d04b4d Updated version number to 3.2.0-SNAPSHOT 2014-08-01 08:57:47 +02:00
jos af3763e747 Added field main to bower.json 2014-08-01 08:55:53 +02:00
jos 4d58258919 Released version 3.1.1 2014-08-01 08:52:34 +02:00