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

.npmignore

@@ -1,3 +1,4 @@
+misc
 node_modules
 src
 test

HISTORY.md

@@ -2,7 +2,7 @@ vis.js history
 http://visjs.org
 
 
-## 2014-03-05, version 0.6.1
+## 2014-03-06, version 0.6.1
 
 ### Graph
 
@@ -11,6 +11,12 @@ http://visjs.org
 - 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

bower.json

@@ -8,6 +8,7 @@
     "url": "git://github.com/almende/vis.git"
   },
   "ignore": [
+    "misc",
     "node_modules",
     "src",
     "test",

dist/vis.css

@@ -143,7 +143,8 @@
   background: none;
 }
 
-.vis.timeline .dot {
+.vis.timeline .dot,
+.vis.timeline .item.dot {
   padding: 0;
   border: 5px solid #97B0F8;
   position: absolute;

dist/vis.js

@@ -5504,8 +5504,8 @@ ItemSet.prototype.getAxis = function getAxis() {
 ItemSet.prototype.reflow = function reflow () {
   var changed = 0,
       options = this.options,
-      marginAxis = options.margin && options.margin.axis || this.defaultOptions.margin.axis,
-      marginItem = options.margin && options.margin.item || this.defaultOptions.margin.item,
+      marginAxis = (options.margin && 'axis' in options.margin) ? options.margin.axis : this.defaultOptions.margin.axis,
+      marginItem = (options.margin && 'item' in options.margin) ? options.margin.item : this.defaultOptions.margin.item,
       update = util.updateProperty,
       asNumber = util.option.asNumber,
       asSize = util.option.asSize,
@@ -17583,9 +17583,10 @@ Graph.prototype._animationStep = function() {
   this.renderTime = Date.now() - renderTime;
 };
 
-
-window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
-                               window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+if (typeof window !== 'undefined') {
+  window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
+                                 window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+}
 
 /**
  * Schedule a animation step with the refreshrate interval.

docs/timeline.html

@@ -216,13 +216,13 @@ var items = [
     <td>no</td>
     <td>This field is optional. A className can be used to give items
       an individual css style. For example, when an item has className
-      'red', one can define a css style
-      <code>
-        .red {
-        background-color: red;
-        border-color: dark-red;
-        }
-      </code>.
+      'red', one can define a css style like:
+      <pre class="prettyprint lang-css">
+.vis.timeline .red {
+  color: white;
+  background-color: red;
+  border-color: darkred;
+}</pre>
       More details on how to style items can be found in the section
       <a href="#Styles">Styles</a>.
     </td>
@@ -310,7 +310,10 @@ var groups = [
 <pre class="prettyprint lang-js">
 var options = {
   width: '100%',
-  height: '30px'
+  height: '30px',
+  margin: {
+    item: 20
+  }
 };
 </pre>
 
@@ -476,7 +479,13 @@ var options = {
   <td>Number</td>
   <td>5</td>
   <td>The padding of items, needed to correctly calculate the size
-    of item ranges. Must correspond with the css of item ranges.</td>
+    of item ranges. Must correspond with the css of items, for example when setting <code>options.padding=10</code>, corresponding css is:
+  <pre class="prettyprint lang-css">
+.vis.timeline .item {
+  padding: 10px;
+}
+  </pre>
+  </td>
 </tr>
 
 <tr>

src/graph/Graph.js

@@ -1812,9 +1812,10 @@ Graph.prototype._animationStep = function() {
   this.renderTime = Date.now() - renderTime;
 };
 
-
-window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
-                               window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+if (typeof window !== 'undefined') {
+  window.requestAnimationFrame = window.requestAnimationFrame || window.mozRequestAnimationFrame ||
+                                 window.webkitRequestAnimationFrame || window.msRequestAnimationFrame;
+}
 
 /**
  * Schedule a animation step with the refreshrate interval.

src/timeline/component/ItemSet.js

@@ -446,8 +446,8 @@ ItemSet.prototype.getAxis = function getAxis() {
 ItemSet.prototype.reflow = function reflow () {
   var changed = 0,
       options = this.options,
-      marginAxis = options.margin && options.margin.axis || this.defaultOptions.margin.axis,
-      marginItem = options.margin && options.margin.item || this.defaultOptions.margin.item,
+      marginAxis = (options.margin && 'axis' in options.margin) ? options.margin.axis : this.defaultOptions.margin.axis,
+      marginItem = (options.margin && 'item' in options.margin) ? options.margin.item : this.defaultOptions.margin.item,
       update = util.updateProperty,
       asNumber = util.option.asNumber,
       asSize = util.option.asSize,

src/timeline/component/css/item.css

@@ -47,7 +47,8 @@
   background: none;
 }
 
-.vis.timeline .dot {
+.vis.timeline .dot,
+.vis.timeline .item.dot {
   padding: 0;
   border: 5px solid #97B0F8;
   position: absolute;