jmgraph 3.1.92 → 3.1.94

package/dist/jmgraph.js

@@ -1978,11 +1978,11 @@ var jmEvents = /*#__PURE__*/function () {
       }
     }
   }, {
-    key: "destory",
+    key: "destroy",
     value: // 销毁
-    function destory() {
-      this.mouseHandler.destory();
-      this.keyHandler.destory();
+    function destroy() {
+      this.mouseHandler.destroy();
+      this.keyHandler.destroy();
     }
   }]);
 
@@ -2108,8 +2108,8 @@ var jmMouseEvent = /*#__PURE__*/function () {
     } // 销毁所有事件
 
   }, {
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       for (var name in this.eventEvents) {
         var event = this.eventEvents[name];
         if (!event || !event.fun) continue;
@@ -2189,8 +2189,8 @@ var jmKeyEvent = /*#__PURE__*/function () {
     } // 销毁所有事件
 
   }, {
-    key: "destory",
-    value: function destory() {
+    key: "destroy",
+    value: function destroy() {
       for (var name in this.eventEvents) {
         var event = this.eventEvents[name];
         if (!event || !event.fun) continue;
@@ -2614,7 +2614,7 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
     }
 
     _this.canvas = canvas;
-    if (!_this.context) _this.context = canvas.getContext('2d');
+    _this.context = canvas.getContext('2d');
 
     _this.__init(callback);
 
@@ -2672,9 +2672,7 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
 
       if (this.isWXMiniApp) {
         scale = wx.getSystemInfoSync().pixelRatio || 1;
-      }
-
-      if (scale > 1) {
+      } else if (scale > 1) {
         this.__normalSize = this.__normalSize || {
           width: 0,
           height: 0
@@ -2682,18 +2680,11 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
         w = w || this.__normalSize.width || this.width, h = h || this.__normalSize.height || this.height;
         if (w) this.__normalSize.width = w;
         if (h) this.__normalSize.height = h;
-
-        if (this.canvas.style) {
-          this.canvas.style.width = w + "px";
-          this.canvas.style.height = h + "px";
-          this.canvas.height = h * scale;
-          this.canvas.width = w * scale;
-          this.context.scale(scale, scale);
-        } else {
-          this.canvas.height = h;
-          this.canvas.width = w;
-        }
-
+        this.canvas.style && (this.canvas.style.width = w + "px");
+        this.canvas.style && (this.canvas.style.height = h + "px");
+        this.canvas.height = h * scale;
+        this.canvas.width = w * scale;
+        this.context.scale(scale, scale);
         this.devicePixelRatio = scale;
       }
     }
@@ -3117,7 +3108,7 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
       this.___isAutoRefreshing = true;
 
       function update() {
-        if (self.destoryed) {
+        if (self.destroyed) {
           self.___isAutoRefreshing = false;
           return; // 已销毁
         }
@@ -3134,10 +3125,10 @@ var jmGraph = /*#__PURE__*/function (_jmControl) {
     } // 销毁当前对象
 
   }, {
-    key: "destory",
-    value: function destory() {
-      this.eventHandler.destory();
-      this.destoryed = true; // 标记已销毁
+    key: "destroy",
+    value: function destroy() {
+      this.eventHandler.destroy();
+      this.destroyed = true; // 标记已销毁
     }
   }], [{
     key: "create",