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

HISTORY.md

@@ -11,6 +11,8 @@ http://visjs.org
 ### Graph2d
 
 - Fixed #1630: method `getDataRange` was wrongly called `getItemRange` in docs.
+- Fixed #1655: use parseFloat instead of Number.parseFloat, as the latter is
+  not supported in IE. Thanks @ttjoseph.
 
 ### Graph3d
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "vis",
-  "main": ["dist/vis.min.js", "dist/vis.min.css"],
+  "main": ["dist/vis.js", "dist/vis.css"],
   "description": "A dynamic, browser-based visualization library.",
   "homepage": "http://visjs.org/",
   "license": ["Apache-2.0", "MIT"],

lib/timeline/component/DataAxis.js

@@ -29,12 +29,12 @@ function DataAxis (body, options, svg, linegraphOptions) {
     alignZeros: true,
     left:{
       range: {min:undefined,max:undefined},
-      format: function (value) {return ''+Number.parseFloat(value.toPrecision(3));},
+      format: function (value) {return ''+parseFloat(value.toPrecision(3));},
       title: {text:undefined,style:undefined}
     },
     right:{
       range: {min:undefined,max:undefined},
-      format: function (value) {return ''+Number.parseFloat(value.toPrecision(3));},
+      format: function (value) {return ''+parseFloat(value.toPrecision(3));},
       title: {text:undefined,style:undefined}
     }
   };