update from master

HISTORY.md

@@ -2,13 +2,71 @@ vis.js history
 http://visjs.org
 
 
+## 2014-03-06, version 0.6.1
+
+### Graph
+
+- Bugfix graphviz examples.
+- Bugfix labels position for smooth curves.
+- Tweaked graphviz example physics.
+- Updated physics documentation to stress importance of configurePhysics.
+
+### Timeline
+
+- Fixed a bug with options `margin.axis` and `margin.item` being ignored when setting them to zero.
+- Some clarifications in the documentation.
+
+
+## 2014-03-05, version 0.6.0
+
+### Graph
+
+- Added Physics Configuration option. This makes tweaking the physics system to suit your needs easier.
+- Click and doubleClick events.
+- Initial zoom bugfix.
+- Directions for Hierarchical layout.
+- Refactoring and bugfixes.
+
+
+## 2014-02-20, version 0.5.1
+
+- Fixed broken bower module.
+
+
+## 2014-02-20, version 0.5.0
+
+### Timeline
+
+- Editable Items: drag items, add new items, update items, and remove items.
+- Implemented options `selectable`, `editable`.
+- Added events `timechange` and `timechanged` when dragging the custom time bar.
+- Multiple items can be selected using ctrl+click or shift+click.
+- Implemented functions `setWindow(start, end)` and `getWindow()`.
+- Fixed scroll to zoom not working on IE in standards mode.
+
+### Graph
+
+- Editable nodes and edges: create, update, and remove them.
+- Support for smooth, curved edges (on by default).
+- Performance improvements.
+- Fixed scroll to zoom not working on IE in standards mode.
+- Added hierarchical layout option.
+- Overhauled physics system, now using Barnes-Hut simulation by default. Great performance gains.
+- Modified clustering system to give better results.
+- Adaptive performance system to increase visual performance (60fps target).
+
+### DataSet
+
+- Renamed functions `subscribe` and `unsubscribe` to `on` and `off` respectively.
+
+
 ## 2014-01-31, version 0.4.0
 
 ### Timeline
 
 - Implemented functions `on` and `off` to create event listeners for events
   `rangechange`, `rangechanged`, and `select`.
-- Impelmented function `select` to get and set the selected items.
+- Implemented function `select` to get and set the selected items.
 - Items can be selected by clicking them, muti-select by holding them.
 - Fixed non working `start` and `end` options.
 
@@ -20,7 +78,7 @@ http://visjs.org
   datasets (up to 10x!).
 - Support for automatic clustering in Graph to handle large (>50000) datasets
   without losing performance.
-- Added automatic intial zooming to Graph, to more easily view large amounts
+- Added automatic initial zooming to Graph, to more easily view large amounts
   of data.
 - Added local declustering to Graph, freezing the simulation of nodes outside
   of the cluster.

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
@@ -29,6 +31,8 @@ task('default', ['build', 'minify'], function () {
 desc('Build the visualization library vis.js');
 task('build', {async: true}, function () {
   jake.mkdirP(DIST);
+  jake.mkdirP(DIST + '/img');
+
   // concatenate and stringify the css files
   concat({
     src: [
@@ -39,7 +43,10 @@ task('build', {async: true}, function () {
       './src/timeline/component/css/item.css',
       './src/timeline/component/css/timeaxis.css',
       './src/timeline/component/css/currenttime.css',
-      './src/timeline/component/css/customtime.css'
+      './src/timeline/component/css/customtime.css',
+
+      './src/graph/css/graph-manipulation.css',
+      './src/graph/css/graph-navigation.css'
     ],
     dest: VIS_CSS,
     separator: '\n'
@@ -54,8 +61,6 @@ task('build', {async: true}, function () {
 
       './src/shim.js',
       './src/util.js',
-      './src/events.js',
-      './src/EventBus.js',
       './src/DataSet.js',
       './src/DataView.js',
 
@@ -82,10 +87,17 @@ task('build', {async: true}, function () {
       './src/graph/Popup.js',
       './src/graph/Groups.js',
       './src/graph/Images.js',
-      './src/graph/SectorsMixin.js',
-      './src/graph/ClusterMixin.js',
-      './src/graph/SelectionMixin.js',
-      './src/graph/NavigationMixin.js',
+      './src/graph/graphMixins/physics/PhysicsMixin.js',
+      './src/graph/graphMixins/physics/HierarchialRepulsion.js',
+      './src/graph/graphMixins/physics/BarnesHut.js',
+      './src/graph/graphMixins/physics/Repulsion.js',
+      './src/graph/graphMixins/HierarchicalLayoutMixin.js',
+      './src/graph/graphMixins/ManipulationMixin.js',
+      './src/graph/graphMixins/SectorsMixin.js',
+      './src/graph/graphMixins/ClusterMixin.js',
+      './src/graph/graphMixins/SelectionMixin.js',
+      './src/graph/graphMixins/NavigationMixin.js',
+      './src/graph/graphMixins/MixinLoader.js',
       './src/graph/Graph.js',
 
       './src/module/exports.js'
@@ -95,7 +107,10 @@ task('build', {async: true}, function () {
   });
 
   // copy images
-  wrench.copyDirSyncRecursive('./src/graph/img', DIST+ '/img', {
+  wrench.copyDirSyncRecursive('./src/graph/img', DIST + '/img/graph', {
+    forceDelete: true
+  });
+  wrench.copyDirSyncRecursive('./src/timeline/img', DIST + '/img/timeline', {
     forceDelete: true
   });
 
@@ -131,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,
@@ -143,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.4.0",
+  "version": "0.6.1",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "repository": {