From 94c507be1575856ad182e5f3055a8332e74494c6 Mon Sep 17 00:00:00 2001
From: Bala Clark <bala.clark@clock.co.uk>
Date: Mon, 13 Jul 2015 18:16:09 +0200
Subject: [PATCH] minify css, upgrade uglify-js

---
 .gitignore          | 1 +
 Makefile            | 3 ++-
 examples/basic.html | 4 ++--
 package.json        | 5 +++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index c86ccd4..c4619c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 .DS_Store
 .project
 .settings
+tags
 lib/tests/pid.txt
 
 comicbook
diff --git a/Makefile b/Makefile
index 819100b..593e6bc 100755
--- a/Makefile
+++ b/Makefile
@@ -15,9 +15,10 @@ build:
 	@cp lib/vendor/pixastic/pixastic.worker.control.js comicbook/js/pixastic
 	@cp lib/vendor/pixastic/license-gpl-3.0.txt comicbook/js/pixastic
 	@cp lib/vendor/pixastic/license-mpl.txt comicbook/js/pixastic
-	@./node_modules/.bin/uglifyjs -nc comicbook/js/comicbook.js > comicbook/js/comicbook.min.js
+	@./node_modules/.bin/uglifyjs comicbook/js/comicbook.js --compress --mangle --screw-ie8 --output comicbook.min.js --source-map comicbook/js/comicbook.min.js.map --source-map-root ./
 	@echo "Compiling CSS..."
 	@cat fonts/icomoon-toolbar/style.css css/reset.css css/styles.css css/toolbar.css > comicbook/comicbook.css
+	@./node_modules/.bin/cssmin comicbook/comicbook.css > comicbook/comicbook.min.css
 	@echo "Copying assets..."
 	@cp -r css/img comicbook/img
 	@cp -r icons/1_Desktop_Icons/icon_128.png comicbook/img
diff --git a/examples/basic.html b/examples/basic.html
index 87c4be8..c4958dc 100755
--- a/examples/basic.html
+++ b/examples/basic.html
@@ -10,8 +10,8 @@
 		<title>Comic Book Reader</title>
 
 		<script src="//ajax.googleapis.com/ajax/libs/jquery/2.0.0/jquery.min.js"></script>
-		<script src="comicbook/js/comicbook.min.js"></script>
-		<link rel="stylesheet" href="comicbook/comicbook.css">
+		<script src="/comicbook/js/comicbook.min.js"></script>
+		<link rel="stylesheet" href="comicbook/comicbook.min.css">
 		<link rel="shortcut icon" sizes="196x196" href="../icons/1_Desktop_icons/icon_196.png">
 		<link rel="apple-touch-icon" sizes="128x128" href="../icons/1_Desktop_icons/con_128.png">
 		<link rel="apple-touch-icon-precomposed" sizes="128x128" href="../icons/1_Desktop_icons/con_128.png">
diff --git a/package.json b/package.json
index 82052c8..48c098a 100644
--- a/package.json
+++ b/package.json
@@ -24,9 +24,10 @@
     }
   ],
   "devDependencies": {
-    "handlebars": "1.0.10",
+    "cssmin": "^0.4.3",
+    "handlebars": "^1.0.10",
     "mocha": "^2.2.5",
     "standard": "^4.5.3",
-    "uglify-js": "1.3.4"
+    "uglify-js": "^2.4.23"
   }
 }