Merge branch 'develop' of https://github.com/almende/vis into develop

Conflicts solved:
	HISTORY.md
	dist/vis.js

HISTORY.md

@@ -1,13 +1,14 @@
 vis.js history
 http://visjs.org
 
-## 2014-03-04, version 0.6.1
+
+## 2014-03-05, version 0.6.1
 
 ### Graph
 
 - Bugfix graphviz examples
 
-## 2014-03-04, version 0.6.0
+## 2014-03-05, version 0.6.0
 
 ### Graph
 
@@ -17,6 +18,7 @@ http://visjs.org
 - Directions for Hierarchical layout.
 - Refactoring and bugfixes.
 
+
 ## 2014-02-20, version 0.5.1
 
 - Fixed broken bower module.

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

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "0.6.0-SNAPSHOT",
+  "version": "0.7.0-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {

dist/vis.js

@@ -4,7 +4,9 @@
  *
  * A dynamic, browser-based visualization library.
  *
+
  * @version 0.6.0-SNAPSHOT
+
  * @date    2014-03-05
  *
  * @license

img/external-link-icons/license.txt

@@ -1,40 +0,0 @@
-/**************************************\
-Shapes4FREE License
-http://www.shapes4free.com/ - visit us to get free photoshop shapes, read our easy-to-understand shapes tutorials and tips, and view beautiful examples of using shapes in all kinds of design
-More about the license: http://www.shapes4free.com/license/
-\**************************************/
-
-This resource was created by Oksana Khristenko
-
-This resource has been downloaded from Shapes4FREE.com and is free for personal or commercial projects. You may use it for web and print design.
-
-No attribution or backlinks are required, but we would certainly appreciate it if you bookmarked www.shapes4free.com and shared the link to it with your friends:
-
-www.shapes4free.com - free photoshop shapes
-
-You may not resell or distribute this resource. Uploading it to another website 
-or offering them for download on another website is not allowed. If you would like to feature this resource on 
-your website or share them with friends, do not link directly to the resource files, 
-please link to the appropriate page on Shapes4FREE.com where it is possible to download the freebie.
-
-/**************************************\
-Shapes4FREE Ëèöåíçèÿ
-http://www.shapes4free.com/ - áåñïëàòíûå ôèãóðû äëÿ Ôîòîøîïà, óðîêè è ïîäñêàçêè, à òàêæå êðàñèâûå ïðèìåðû èñïîëüçîâàíèÿ ôèãóð âî âñåõ âèäàõ äèçàéíà
-Ëèöåíçèÿ: http://www.shapes4free.com/license-ru/
-\**************************************/
-
-Àâòîð: Îêñàíà Õðèñòåíêî 
-
-Âñå áåñïëàòíûå ðåñóðñû êîòîðûå ìîæíî ñêà÷àòü íà Shapes4FREE.com, âêëþ÷àÿ ïðîèçâîëüíûå ôèãóðû äëÿ Ôîòîøîïà 
-(photoshop custom shapes) áåñïëàòíû äëÿ èñïîëüçîâàíèÿ â ëè÷íûõ è êîììåð÷åñêèõ ïðîåêòàõ. Ðàçðåøåíî èñïîëüçîâàòü
-áåñïëàòíûå ðåñóðñû Shapes4FREE â âåá äèçàéíå è ïå÷àòíûõ ìàòåðèàëàõ.
-
-Ññûëêà íà ñàéò Shapes4FREE.com íå òðåáóåòñÿ íî ïðèâåòñòâóåòñÿ. Ìû áóäåì ðàäû åñëè âû ðàññêàæåòå î íàñ äðóçüÿì:
-
-www.shapes4free.com - áåñïëàòíûå ôèãóðû äëÿ Ôîòîøîïà
-
-Çàïðåùåíî ïðîäàâàòü èëè ðàñïðîñòðàíÿòü áåñïëàòíûå ðåñóðñû ñîçäàííûå Shapes4FREE.
-Çàïðåùåíî çàãðóæàòü èõ íà äðóãèå ñàéòû è ïîçâîëÿòü ïîëüçîâàòåëÿì èõ ñêà÷èâàòü. Åñëè âû õîòèòå ðàññêàçàòü î íàøåì
-áåñïëàòíîì ðåñóðñå íà ñàéòå èëè ïîäåëèòüñÿ ñ äðóçüÿìè, íå ñîçäàâàéòå ïðÿìûõ ññûëîê íà ôàéë, ñîçäàéòå ññûëêó íà
-ñîîòâåòñòâóþùóþ ñòðàíèöó ñàéòà Shapes4FREE.com ãäå ìîæíî áóäåò ñêà÷àòü ýòîò ðåñóðñ.
-

img/logo/vis.svg

@@ -1,169 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="128"
-   height="128"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="vis.svg"
-   inkscape:export-filename="/home/jos/projects/vis-pages/img/logo/vis256.png"
-   inkscape:export-xdpi="180"
-   inkscape:export-ydpi="180">
-  <defs
-     id="defs4">
-    <filter
-       inkscape:collect="always"
-       id="filter3765">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.098994946"
-         id="feGaussianBlur3767" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3765-8">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.098994946"
-         id="feGaussianBlur3767-2" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3765-8-3">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.098994946"
-         id="feGaussianBlur3767-2-9" />
-    </filter>
-    <filter
-       color-interpolation-filters="sRGB"
-       inkscape:collect="always"
-       id="filter3765-3">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.098994946"
-         id="feGaussianBlur3767-3" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="2.8284271"
-     inkscape:cx="13.788283"
-     inkscape:cy="60.335199"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:snap-global="true"
-     inkscape:window-width="1600"
-     inkscape:window-height="850"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:showpageshadow="false"
-     borderlayer="false"
-     showborder="true">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2987"
-       empspacing="5"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-924.36217)">
-    <path
-       sodipodi:type="arc"
-       style="fill:#109618;fill-opacity:1;stroke:none;opacity:0.01587302"
-       id="path4104"
-       sodipodi:cx="64.25"
-       sodipodi:cy="64.5"
-       sodipodi:rx="63.75"
-       sodipodi:ry="64"
-       d="m 128,64.5 a 63.75,64 0 1 1 -127.5,0 63.75,64 0 1 1 127.5,0 z"
-       transform="matrix(0.93139646,0,0,0.83984375,-189.81956,958.94835)" />
-    <path
-       style="fill:#ffcf00;fill-opacity:1;stroke:#ffcf00;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="M 3.3795626,993.2579 C 22.563164,969.55671 64.941101,938.83212 101.8906,932.98778 c 15.01437,32.97153 15.80482,65.24066 11.89745,97.27812 -53.04371,-1.7716 -84.489701,-14.912 -110.4084874,-37.008 z"
-       id="path2991"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="fill:#109618;fill-opacity:1;stroke:#109618;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       d="m 4.586161,1010.1966 c 29.519439,19.0948 61.669847,32.8593 114.396079,29.9232 6.98138,-4.9614 5.91066,-11.2031 3.61936,-17.6388 -37.656342,4.9772 -79.514689,1.6063 -118.015439,-12.2844 z"
-       id="path3761"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ff9900;fill-opacity:1;stroke:none;filter:url(#filter3765-8)"
-       id="path3763-6"
-       sodipodi:cx="66.998367"
-       sodipodi:cy="63.476505"
-       sodipodi:rx="10.429825"
-       sodipodi:ry="9.3691645"
-       d="m 77.428192,63.476505 a 10.429825,9.3691645 0 1 1 -20.85965,0 10.429825,9.3691645 0 1 1 20.85965,0 z"
-       transform="matrix(3.7791753,0,0,4.159068,-180.52628,715.8869)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#dc3912;fill-opacity:1;stroke:none;filter:url(#filter3765-8-3)"
-       id="path3763-6-3"
-       sodipodi:cx="66.998367"
-       sodipodi:cy="63.476505"
-       sodipodi:rx="10.429825"
-       sodipodi:ry="9.3691645"
-       d="m 77.428192,63.476505 a 10.429825,9.3691645 0 1 1 -20.85965,0 10.429825,9.3691645 0 1 1 20.85965,0 z"
-       transform="matrix(2.1560756,0,0,2.3930971,-65.92105,839.4416)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3765)"
-       id="path3763"
-       sodipodi:cx="66.998367"
-       sodipodi:cy="63.476505"
-       sodipodi:rx="10.429825"
-       sodipodi:ry="9.3691645"
-       d="m 77.428192,63.476505 a 10.429825,9.3691645 0 1 1 -20.85965,0 10.429825,9.3691645 0 1 1 20.85965,0 z"
-       transform="matrix(1.369772,0,0,1.5215787,-11.897888,900.22297)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#4d4d4d;fill-opacity:1;stroke:none;filter:url(#filter3765-3)"
-       id="path3763-9"
-       sodipodi:cx="66.998367"
-       sodipodi:cy="63.476505"
-       sodipodi:rx="10.429825"
-       sodipodi:ry="9.3691645"
-       d="m 77.428192,63.476505 a 10.429825,9.3691645 0 1 1 -20.85965,0 10.429825,9.3691645 0 1 1 20.85965,0 z"
-       transform="matrix(0.68506744,0,0,0.76063592,38.273417,952.729)" />
-  </g>
-</svg>

misc/how_to_publish.md

@@ -28,7 +28,7 @@ This generates the vis.js library in the folder `./dist`.
 
 - Commit the changes to the `develop` branch.
 - Merge the `develop` branch into the `master` branch.
-- Push the brances to github
+- Push the branches to github
 - Create a version tag (with the new version number) and push it to github:
 
         git tag v0.3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "0.6.0-SNAPSHOT",
+  "version": "0.7.0-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {
@@ -28,6 +28,7 @@
   "devDependencies": {
     "jake": "latest",
     "jake-utils": "latest",
+    "clean-css": "latest",
     "browserify": "3.22",
     "wrench": "latest",
     "moment": "latest",