* Shuffle all non-coffee2ls vendor scripts to vendor/.

audreyt · Nov 10, 2012 · a7e9d64 · a7e9d64
1 parent cf23357
commit a7e9d64
Show file tree

Hide file tree

Showing 107 changed files with 7,405 additions and 11 deletions.
diff --git a/app/assets/demo.html b/app/assets/demo.html
@@ -3,7 +3,7 @@
 window.attachEvent("onload", function() { CFInstall.check({
 mode: "inline", // the default
 node: "prompt"
-}); });</script><![endif]--><![if !IE]><link rel="stylesheet" href="css/app.css"/><script src="https://raw.github.com/gkz/coffee2ls/master/extras/coffee2ls.min.js" type="text/javascript" charset="utf-8"></script><script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/underscore.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/coffeescript.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/js2coffee.min.js" type="text/javascript" charset="utf-8"></script><script src="src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script><script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js" type="text/javascript" charset="utf-8"></script><script src="js/app.js" type="text/javascript" charset="utf-8"></script><script>require("angular-ace");
+}); });</script><![endif]--><![if !IE]><link rel="stylesheet" href="css/app.css"/><script src="https://raw.github.com/gkz/coffee2ls/master/extras/coffee2ls.min.js" type="text/javascript" charset="utf-8"></script><script src="js/app.js" type="text/javascript" charset="utf-8"></script><script src="js/vendor.js" type="text/javascript" charset="utf-8"></script><script>require("angular-ace");
 require("controllers");</script></head><body ng-controller="TabCtrl"><div id="container" style="height: auto;"><form method="post"><div id="js2ls" class="tab"><div id="js2lslefteditor" ace="javascript" ng-model="jscode"><textarea name="js2lssrc"> 
 /* Type JavaScript here! */
 (function () {

diff --git a/src-min-noconflict/worker-coffee.js → app/assets/worker-coffee.js b/src-min-noconflict/worker-coffee.js → app/assets/worker-coffee.js
diff --git a/src-min-noconflict/worker-css.js → app/assets/worker-css.js b/src-min-noconflict/worker-css.js → app/assets/worker-css.js
diff --git a/src-min-noconflict/worker-javascript.js → app/assets/worker-javascript.js b/src-min-noconflict/worker-javascript.js → app/assets/worker-javascript.js
diff --git a/src-min-noconflict/worker-json.js → app/assets/worker-json.js b/src-min-noconflict/worker-json.js → app/assets/worker-json.js
diff --git a/src-min-noconflict/worker-xquery.js → app/assets/worker-xquery.js b/src-min-noconflict/worker-xquery.js → app/assets/worker-xquery.js
diff --git a/app/demo.jade b/app/demo.jade
@@ -15,13 +15,8 @@ html(ng-app='myapp')
     | <![if !IE]>
     link(rel='stylesheet', href='css/app.css')
     script(src='https://raw.github.com/gkz/coffee2ls/master/extras/coffee2ls.min.js', type='text/javascript', charset='utf-8')
-    script(src='https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js', type='text/javascript', charset='utf-8')
-    script(src='http://js2coffee.org/scripts/underscore.min.js', type='text/javascript', charset='utf-8')
-    script(src='http://js2coffee.org/scripts/coffeescript.min.js', type='text/javascript', charset='utf-8')
-    script(src='http://js2coffee.org/scripts/js2coffee.min.js', type='text/javascript', charset='utf-8')
-    script(src='src-min-noconflict/ace.js', type='text/javascript', charset='utf-8')
-    script(src='http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js', type='text/javascript', charset='utf-8')
     script(src='js/app.js', type='text/javascript', charset='utf-8')
+    script(src='js/vendor.js', type='text/javascript', charset='utf-8')
     script
       require("angular-ace");
       require("controllers");

diff --git a/config.ls b/config.ls
@@ -7,6 +7,12 @@ exports.config =
       joinTo:
         'js/app.js': /^app/
         'js/vendor.js': /^vendor/
+      order:
+        before: <[
+          vendor/angular/angular.min.js
+          vendor/jquery/jquery.min.js
+          vendor/js2coffee.org/underscore.min.js
+        ]>
     stylesheets:
       joinTo:
         'css/app.css': /^(app|vendor)/
diff --git a/demo.html b/demo.html
diff --git a/demo.html b/demo.html
@@ -0,0 +1,6 @@
+<html ng-app="myapp">
+    <meta http-equiv="refresh" content="0;URL='public/demo.html'">
+    <script>
+        location.href = './public/demo.html';
+    </script>
+</html>
diff --git a/public/demo.html b/public/demo.html
@@ -3,7 +3,7 @@
 window.attachEvent("onload", function() { CFInstall.check({
 mode: "inline", // the default
 node: "prompt"
-}); });</script><![endif]--><![if !IE]><link rel="stylesheet" href="css/app.css"/><script src="https://raw.github.com/gkz/coffee2ls/master/extras/coffee2ls.min.js" type="text/javascript" charset="utf-8"></script><script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/underscore.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/coffeescript.min.js" type="text/javascript" charset="utf-8"></script><script src="http://js2coffee.org/scripts/js2coffee.min.js" type="text/javascript" charset="utf-8"></script><script src="src-min-noconflict/ace.js" type="text/javascript" charset="utf-8"></script><script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.2/angular.min.js" type="text/javascript" charset="utf-8"></script><script src="js/app.js" type="text/javascript" charset="utf-8"></script><script>require("angular-ace");
+}); });</script><![endif]--><![if !IE]><link rel="stylesheet" href="css/app.css"/><script src="https://raw.github.com/gkz/coffee2ls/master/extras/coffee2ls.min.js" type="text/javascript" charset="utf-8"></script><script src="js/app.js" type="text/javascript" charset="utf-8"></script><script src="js/vendor.js" type="text/javascript" charset="utf-8"></script><script>require("angular-ace");
 require("controllers");</script></head><body ng-controller="TabCtrl"><div id="container" style="height: auto;"><form method="post"><div id="js2ls" class="tab"><div id="js2lslefteditor" ace="javascript" ng-model="jscode"><textarea name="js2lssrc"> 
 /* Type JavaScript here! */
 (function () {

diff --git a/public/js/templates.js b/public/js/templates.js