Browse Source

Merge branch 'master' into develop

css_transitions
josdejong 10 years ago
parent
commit
07f3c44b38
5 changed files with 11 additions and 3 deletions
  1. +7
    -1
      Jakefile.js
  2. +1
    -1
      dist/vis.js
  3. +1
    -0
      dist/vis.min.css
  4. +1
    -1
      dist/vis.min.js
  5. +1
    -0
      package.json

+ 7
- 1
Jakefile.js View File

@ -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);
});
/**

+ 1
- 1
dist/vis.js View File

@ -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

+ 1
- 0
dist/vis.min.css
File diff suppressed because it is too large
View File


+ 1
- 1
dist/vis.min.js View File

@ -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

+ 1
- 0
package.json View File

@ -28,6 +28,7 @@
"devDependencies": {
"jake": "latest",
"jake-utils": "latest",
"clean-css": "latest",
"browserify": "3.22",
"wrench": "latest",
"moment": "latest",

Loading…
Cancel
Save