jmgraph 3.1.92 → 3.1.94

package/src/core/jmGraph.js

@@ -69,7 +69,7 @@ export default class jmGraph extends jmControl {
 			}
 		}	
 		this.canvas = canvas;	
-		if(!this.context) this.context = canvas.getContext('2d');
+		this.context = canvas.getContext('2d');
 		this.__init(callback);
 	}
 
@@ -124,24 +124,18 @@ export default class jmGraph extends jmControl {
 		if(this.isWXMiniApp) {
 			scale = wx.getSystemInfoSync().pixelRatio || 1;
 		}
-		if (scale > 1) {
+		else if (scale > 1) {
 		  this.__normalSize = this.__normalSize || { width: 0, height: 0};
 		  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;
 		}
 	}
@@ -505,7 +499,7 @@ export default class jmGraph extends jmControl {
 		this.___isAutoRefreshing = true;
 		
 		function update() {
-			if(self.destoryed) {
+			if(self.destroyed) {
 				self.___isAutoRefreshing = false;
 				return;// 已销毁
 			}
@@ -520,9 +514,9 @@ export default class jmGraph extends jmControl {
 	}
 
 	// 销毁当前对象
-	destory() {
-		this.eventHandler.destory();
-		this.destoryed = true;// 标记已销毁
+	destroy() {
+		this.eventHandler.destroy();
+		this.destroyed = true;// 标记已销毁
 	}
 }