Merge branch 'master' of https://github.com/davebalmer/jo

Conflicts: js/jo.js
davebalmer · Nov 13, 2013 · 7794144 · 7794144
2 parents 601f7b2 + ad5475c
commit 7794144
Show file tree

Hide file tree

Showing 14 changed files with 111 additions and 6,374 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+syntax: glob
+.DS_Store
+*~
+*.bak
+js/jo.js
+js/jo_min.js
diff --git a/build.bat b/build.bat
@@ -21,14 +21,15 @@ del jo_core.js
 del jo_data.js
 del jo_ui.js
 
-if exist jsmin.exe goto minify
+for %%J in (jsmin.exe) do set JSMIN=%%~dp$PATH:Jjsmin.exe
+if not "%JSMIN%"=="" goto minify
 echo "jsmin not found, skipping minification."
 cd ..
 goto end
 
 :minify
 echo "Minifying js\jo.js -> js\jo_min.js"
-jsmin < jo.js > jo_min.js
+%JSMIN% < jo.js > jo_min.js
 cd ..
 goto end
 

diff --git a/css/ios-codebykevin/.DS_Store b/css/ios-codebykevin/.DS_Store
diff --git a/js/.DS_Store b/js/.DS_Store