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

src/tool/canvasGeneral.js

@@ -103,7 +103,9 @@ class myCanvas {
 		document.addEventListener("keyup", this.canvasKeyUp);
 		initAligningGuidelines(this.canvas,true)
 		JSchangeType(this.canvas,'init')
-		this.updateCanvasState('')
+		// this.canvas.on('mouse:up', function(event) {
+		// 	if(this.canvasState != 'move')this.updateCanvasState('')
+		// });
 		this.canvas.on("object:added", (event)=>{
 			if(!this.isLoadCanvas)this.updateCanvasState('')
 		});
@@ -234,7 +236,8 @@ class myCanvas {
 		}else{
 			return
 		}
-		this.canvas.loadFromJSON(this.canvasState, () => {});
+		this.canvas.loadFromJSON(this.canvasState, () => {this.isLoadCanvas = false;});
+		
 	}
 }