Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	dist/vis.js

HISTORY.md

@@ -1,7 +1,13 @@
 # vis.js history
 http://visjs.org
 
-## not yet released, version 4.6.1
+
+## not yet released, version 4.7.1-SNAPSHOT
+
+
+
+
+## 2015-07-27, version 4.7.0
 
 ### Timeline
 
@@ -10,7 +16,6 @@ http://visjs.org
 - Fixed #1118: since v4.6.0, grid of time axis was wrongly positioned on some 
   scales.
 
-
 ### Network
 
 - Added moveNode method.

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "4.6.1-SNAPSHOT",
+  "version": "4.7.1-SNAPSHOT",
   "main": ["dist/vis.min.js", "dist/vis.min.css"],
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",

lib/timeline/Core.js

@@ -265,7 +265,7 @@ Core.prototype.setOptions = function (options) {
           onRender: options.drawPoints
       };
     }
-    
+
     if ('hiddenDates' in this.options) {
       DateUtil.convertHiddenOptions(this.options.moment, this.body, this.options.hiddenDates);
     }
@@ -900,8 +900,10 @@ Core.prototype._stopAutoResize = function () {
   }
 
   // remove event listener on window.resize
-  util.removeEventListener(window, 'resize', this._onResize);
-  this._onResize = null;
+  if (this._onResize) {
+    util.removeEventListener(window, 'resize', this._onResize);
+    this._onResize = null;
+  }
 };
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "version": "4.6.1-SNAPSHOT",
+  "version": "4.7.1-SNAPSHOT",
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "license": "(Apache-2.0 OR MIT)",