Moved sourcecode from /jsoneditor to /src

gaodazhu · May 29, 2014 · 282dc4f · 282dc4f
1 parent 4eae0cf
commit 282dc4f
Show file tree

Hide file tree

Showing 27 changed files with 8 additions and 10 deletions.
diff --git a/.npmignore b/.npmignore
@@ -2,7 +2,7 @@ app
 bower.json
 build
 downloads
-jsoneditor
+src
 misc
 node_modules
 test

diff --git a/Jakefile.js b/Jakefile.js
@@ -39,7 +39,7 @@ task('clear', function () {
  */
 desc('Build the library');
 task('build', ['clear'], function () {
-  var jsoneditorSrc = './jsoneditor/';
+  var jsoneditorSrc = './src/';
   // concatenate the javascript files
   concat({
     src: [
@@ -122,7 +122,7 @@ task('minify', ['build'], function () {
   minify({
     src: JSONEDITOR,
     dest: JSONEDITOR_MIN,
-    header: read('./jsoneditor/js/header.js'),
+    header: read('./src/js/header.js'),
     separator: '\n'
   });
 

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ download:
 
 ### Build
 
-The code of the JSON Editor is located in the folder `jsoneditor`. To build 
+The code of the JSON Editor is located in the folder `src`. To build 
 jsoneditor:
 
 - Install dependencies:
@@ -116,6 +116,5 @@ jsoneditor:
 
       npm run build
 
-  This will generate the files `jsoneditor.js`,
-  `jsoneditor.css`, and minified versions, and will create a folder `build`
-  containing the zipped library and the built web application.
+  This will generate the files `jsoneditor.js`, `jsoneditor.css`, and minified 
+  versions in the root of the project.
diff --git a/asset/ace/ace.js b/asset/ace/ace.js
diff --git a/jsoneditor/css/contextmenu.css → src/css/contextmenu.css b/jsoneditor/css/contextmenu.css → src/css/contextmenu.css
diff --git a/jsoneditor/css/img/description.txt → src/css/img/description.txt b/jsoneditor/css/img/description.txt → src/css/img/description.txt
diff --git a/jsoneditor/css/img/export.sh → src/css/img/export.sh b/jsoneditor/css/img/export.sh → src/css/img/export.sh
diff --git a/jsoneditor/css/img/jsoneditor-icons.png → src/css/img/jsoneditor-icons.png b/jsoneditor/css/img/jsoneditor-icons.png → src/css/img/jsoneditor-icons.png
diff --git a/jsoneditor/css/img/jsoneditor-icons.svg → src/css/img/jsoneditor-icons.svg b/jsoneditor/css/img/jsoneditor-icons.svg → src/css/img/jsoneditor-icons.svg
diff --git a/jsoneditor/css/jsoneditor.css → src/css/jsoneditor.css b/jsoneditor/css/jsoneditor.css → src/css/jsoneditor.css
diff --git a/jsoneditor/css/menu.css → src/css/menu.css b/jsoneditor/css/menu.css → src/css/menu.css
diff --git a/jsoneditor/css/searchbox.css → src/css/searchbox.css b/jsoneditor/css/searchbox.css → src/css/searchbox.css
diff --git a/jsoneditor/js/ace/theme-jsoneditor.js → src/js/ace/theme-jsoneditor.js b/jsoneditor/js/ace/theme-jsoneditor.js → src/js/ace/theme-jsoneditor.js
diff --git a/jsoneditor/js/appendnode.js → src/js/appendnode.js b/jsoneditor/js/appendnode.js → src/js/appendnode.js
diff --git a/jsoneditor/js/contextmenu.js → src/js/contextmenu.js b/jsoneditor/js/contextmenu.js → src/js/contextmenu.js
diff --git a/jsoneditor/js/header.js → src/js/header.js b/jsoneditor/js/header.js → src/js/header.js
diff --git a/jsoneditor/js/highlighter.js → src/js/highlighter.js b/jsoneditor/js/highlighter.js → src/js/highlighter.js
diff --git a/jsoneditor/js/history.js → src/js/history.js b/jsoneditor/js/history.js → src/js/history.js
diff --git a/jsoneditor/js/jsoneditor.js → src/js/jsoneditor.js b/jsoneditor/js/jsoneditor.js → src/js/jsoneditor.js
diff --git a/jsoneditor/js/modebox.js → src/js/modebox.js b/jsoneditor/js/modebox.js → src/js/modebox.js
diff --git a/jsoneditor/js/module.js → src/js/module.js b/jsoneditor/js/module.js → src/js/module.js
diff --git a/jsoneditor/js/node.js → src/js/node.js b/jsoneditor/js/node.js → src/js/node.js
diff --git a/jsoneditor/js/searchbox.js → src/js/searchbox.js b/jsoneditor/js/searchbox.js → src/js/searchbox.js
diff --git a/jsoneditor/js/texteditor.js → src/js/texteditor.js b/jsoneditor/js/texteditor.js → src/js/texteditor.js
diff --git a/jsoneditor/js/treeeditor.js → src/js/treeeditor.js b/jsoneditor/js/treeeditor.js → src/js/treeeditor.js
diff --git a/jsoneditor/js/util.js → src/js/util.js b/jsoneditor/js/util.js → src/js/util.js
diff --git a/test/test.html b/test/test.html
@@ -9,9 +9,7 @@
 
   <!-- ace code editor -->
   <script type="text/javascript" src="../node_modules/ace/build/src-min/ace.js"></script>
-  <script type="text/javascript" src="../node_modules/ace/build/src-min/mode-json.js"></script>
-  <script type="text/javascript" src="../node_modules/ace/build/src-min/theme-textmate.js"></script>
-  <script type="text/javascript" src="../jsoneditor/js/ace/theme-jsoneditor.js"></script>
+  <script type="text/javascript" src="../src/js/ace/theme-jsoneditor.js"></script>
 
   <!-- json lint -->
   <script type="text/javascript" src="../node_modules/jsonlint/lib/jsonlint.js"></script>