diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..b512c09d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/build/build.html b/build/build.html index b21600290..9e5a2333c 100644 --- a/build/build.html +++ b/build/build.html @@ -86,13 +86,13 @@
  • Download and install Node
  • Run this in the command line:
    npm install -g jake
-npm install -g jshint
-npm install -g uglify-js
    • +npm install jshint +npm install uglify-js
  • Run this command inside the Leaflet directory:

    Building using Closure Compiler

      -
    1. Download Closure Compiler and extract it into lib/closure-compiler directory
      2. +
    2. Download Closure Compiler, extract it into closure-compiler directory
    3. Run this command in the root Leaflet directory:
    @@ -139,7 +139,7 @@ npm install -g uglify-js
    • } } - var command = 'java -jar lib/closure-compiler/compiler.jar '; + var command = 'java -jar closure-compiler/compiler.jar '; for (var src in files) { command += '--js src/' + src + ' '; } @@ -154,7 +154,7 @@ npm install -g uglify-js this.focus(); this.select(); }; - + commandInput.onclick = inputSelect; commandInput2.onclick = inputSelect; diff --git a/lib/closure-compiler/.gitignore b/lib/closure-compiler/.gitignore deleted file mode 100644 index ea0f50358..000000000 --- a/lib/closure-compiler/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -compiler.jar -COPYING -README diff --git a/lib/jasmine/jasmine-html.js b/spec/jasmine/jasmine-html.js similarity index 100% rename from lib/jasmine/jasmine-html.js rename to spec/jasmine/jasmine-html.js diff --git a/lib/jasmine/jasmine.css b/spec/jasmine/jasmine.css similarity index 100% rename from lib/jasmine/jasmine.css rename to spec/jasmine/jasmine.css diff --git a/lib/jasmine/jasmine.js b/spec/jasmine/jasmine.js similarity index 100% rename from lib/jasmine/jasmine.js rename to spec/jasmine/jasmine.js diff --git a/spec/runner.html b/spec/runner.html index 3013985b9..27870b7d0 100644 --- a/spec/runner.html +++ b/spec/runner.html @@ -2,24 +2,24 @@ Jasmine Test Runner - - - - + + + + - + - + - + - + - + @@ -42,7 +42,7 @@ - +