Using brace to load Ace. Ace and jsonlint are now packed by default w…

…ith JSONEditor. Removed all redundant build stuff for the assets.
qbektrix · Feb 27, 2015 · 0db2c35 · 0db2c35
1 parent c18145f
commit 0db2c35
Show file tree

Hide file tree

Showing 29 changed files with 20,536 additions and 796 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -3,6 +3,12 @@
 https://github.com/josdejong/jsoneditor
 
 
+## not yet released, version 4.0.0
+
+- Ace editor and jsonlint are now packed with jsoneditor.js by default.
+- Reworked the source code to CommonJS modules, using `brace` to load Ace.
+
+
 ## 2015-01-25, version 3.2.0
 
 - Implemented shortcut keys `Ctrl+\` to format and `Ctrl+Shift+\` to compact

diff --git a/README.md b/README.md
@@ -74,12 +74,12 @@ download:
 <html>
 <head>
     <link rel="stylesheet" type="text/css" href="jsoneditor/jsoneditor.min.css">
-    <script type="text/javascript" src="jsoneditor/jsoneditor.min.js"></script>
+    <script src="jsoneditor/jsoneditor.min.js"></script>
 </head>
 <body>
     <div id="jsoneditor" style="width: 400px; height: 400px;"></div>
 
-    <script type="text/javascript" >
+    <script>
         // create the editor
         var container = document.getElementById("jsoneditor");
         var editor = new JSONEditor(container);

diff --git a/asset/ace/ace.js b/asset/ace/ace.js
diff --git a/asset/ace/ext-searchbox.js b/asset/ace/ext-searchbox.js