Merge branch 'master' into develop

almende · Feb 21, 2014 · 07f3c44 · 07f3c44
2 parents d252683 + ba0ae09
commit 07f3c44
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Jakefile.js b/Jakefile.js
@@ -4,6 +4,7 @@
 var jake = require('jake'),
     browserify = require('browserify'),
     wrench = require('wrench'),
+    CleanCSS = require('clean-css'),
     fs = require('fs');
 
 require('jake-utils');
@@ -14,6 +15,7 @@ var VIS = DIST + '/vis.js';
 var VIS_CSS = DIST + '/vis.css';
 var VIS_TMP = DIST + '/vis.js.tmp';
 var VIS_MIN = DIST + '/vis.min.js';
+var VIS_MIN_CSS = DIST + '/vis.min.css';
 
 /**
  * default task
@@ -144,7 +146,7 @@ task('build', {async: true}, function () {
  * minify the visualization library vis.js
  */
 desc('Minify the visualization library vis.js');
-task('minify', function () {
+task('minify', {async: true}, function () {
   // minify javascript
   minify({
     src: VIS,
@@ -156,6 +158,10 @@ task('minify', function () {
   replacePlaceholders(VIS_MIN);
 
   console.log('created minified ' + VIS_MIN);
+
+  var minified = new CleanCSS().minify(read(VIS_CSS));
+  write(VIS_MIN_CSS, minified);
+  console.log('created minified ' + VIS_MIN_CSS);
 });
 
 /**

diff --git a/dist/vis.js b/dist/vis.js
@@ -5,7 +5,7 @@
  * A dynamic, browser-based visualization library.
  *
  * @version 0.5.1
- * @date    2014-02-20
+ * @date    2014-02-21
  *
  * @license
  * Copyright (C) 2011-2014 Almende B.V, http://almende.com

diff --git a/dist/vis.min.css b/dist/vis.min.css
diff --git a/dist/vis.min.js b/dist/vis.min.js
diff --git a/package.json b/package.json
@@ -28,6 +28,7 @@
   "devDependencies": {
     "jake": "latest",
     "jake-utils": "latest",
+    "clean-css": "latest",
     "browserify": "3.22",
     "wrench": "latest",
     "moment": "latest",