Merge pull request chxj1992#64 from liuzhishan/master

FIX: fix toHeight to return 1.5 when value is Infinity
xdengpao · Jun 6, 2018 · 73afcca · 73afcca
2 parents 9c9a34e + 731064d
commit 73afcca
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/dist/kline.js b/dist/kline.js
@@ -14925,7 +14925,10 @@ function (_NamedObject) {
   }, {
     key: "toHeight",
     value: function toHeight(value) {
-      return Math.floor(value * this._ratio + 1.5);
+		if (value == Infinity || this._ratio == 0) {
+		  return 1.5;
+		}
+	  	return Math.floor(value * this._ratio + 1.5);
     }
   }, {
     key: "update",
@@ -41812,4 +41815,4 @@ registerStorage(__WEBPACK_IMPORTED_MODULE_0__firebase_app__["default"]);
 /***/ })
 /******/ ]);
 });
-//# sourceMappingURL=kline.js.map
+//# sourceMappingURL=kline.js.map
diff --git a/src/js/ranges.js b/src/js/ranges.js
@@ -114,7 +114,10 @@ export class Range extends NamedObject {
     }
 
     toHeight(value) {
-        return Math.floor(value * this._ratio + 1.5);
+		if (value == Infinity || this._ratio == 0) {
+		  return 1.5;
+		}
+	  	return Math.floor(value * this._ratio + 1.5);
     }
 
     update() {