Remove fat build and scope demo to a folder (fix literallycanvas#23)

NourElRashidy · Jan 6, 2013 · 68ef89e · 68ef89e
1 parent 9ef8d9d
commit 68ef89e
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 7,942 deletions.
diff --git a/Makefile b/Makefile
@@ -1,31 +1,23 @@
 .PHONY: coffee clean all update-gh-pages
 
-JS_DEPS =  js/jquery-1.8.2.js js/underscore-1.4.2.js
-
-all: lib/js/literallycanvas.fat.js lib/js/literallycanvas.fat.min.js lib/js/literallycanvas.thin.js lib/js/literallycanvas.thin.min.js
+all: lib/js/literallycanvas.js lib/js/literallycanvas.min.js
 
 clean:
-	rm -f js/coffee/*.js
-	rm -f js/gen/*.js
+	rm -f gen/*.js
 	rm -f lib/js/literallycanvas.*.js
 
 watch-js:
-	watch -n 2 make lib/js/literallycanvas.fat.js
+	watch -n 2 make lib/js/literallycanvas.js
 
 coffee: coffee/*.coffee
-	coffee -o js/coffee -c coffee
-
-lib/js/literallycanvas.fat.js: coffee
-	uglifyjs2 $(JS_DEPS) js/coffee/* -o lib/js/literallycanvas.fat.js --beautify
-
-lib/js/literallycanvas.fat.min.js: coffee
-	uglifyjs2 $(JS_DEPS) js/coffee/* -o lib/js/literallycanvas.fat.min.js --compress
+	mkdir -p gen/coffee_out
+	coffee -o gen/coffee_out -c coffee
 
-lib/js/literallycanvas.thin.js: coffee
-	uglifyjs2 js/coffee/* -o lib/js/literallycanvas.thin.js --beautify
+lib/js/literallycanvas.js: coffee
+	uglifyjs2 gen/coffee_out/* -o lib/js/literallycanvas.js --beautify
 
-lib/js/literallycanvas.thin.min.js: coffee
-	uglifyjs2 js/coffee/* -o lib/js/literallycanvas.thin.min.js --compress
+lib/js/literallycanvas.min.js: coffee
+	uglifyjs2 gen/coffee_out/* -o lib/js/literallycanvas.min.js --compress
 
 serve:
 	python -m SimpleHTTPServer 8000 .
diff --git a/demo.html → demo/index.html b/demo.html → demo/index.html
@@ -2,8 +2,8 @@
 <html>
   <head>
     <title>Literally Canvas</title>
-    <link href="lib/css/colorpicker.css" rel="stylesheet">
-    <link href="lib/css/literally.css" rel="stylesheet">
+    <link href="/lib/css/colorpicker.css" rel="stylesheet">
+    <link href="/lib/css/literally.css" rel="stylesheet">
 
     <style type="text/css">
       body {
@@ -30,7 +30,9 @@
       <div class="literally"><canvas></canvas></div>
     </div>
 
-    <script src="lib/js/literallycanvas.fat.js"></script>
+    <script src="/demo/jquery-1.8.2.js"></script>
+    <script src="/demo/underscore-1.4.2.js"></script>
+    <script src="/lib/js/literallycanvas.js"></script>
 
     <script type="text/javascript">
       $(document).ready(function() {
@@ -42,7 +44,7 @@
         });
 
         // the only LC-specific thing we have to do
-        $('.literally').literallycanvas();
+        $('.literally').literallycanvas({imageURLPrefix: '/lib/img'});
       });
     </script>
   </body>

diff --git a/js/jquery-1.8.2.js → demo/jquery-1.8.2.js b/js/jquery-1.8.2.js → demo/jquery-1.8.2.js
diff --git a/js/underscore-1.4.2.js → demo/underscore-1.4.2.js b/js/underscore-1.4.2.js → demo/underscore-1.4.2.js
diff --git a/js/coffee/.gitignore → gen/.gitignore b/js/coffee/.gitignore → gen/.gitignore