From e6cd2bf542ea0cae80ac989091e4b5421f80c4f3 Mon Sep 17 00:00:00 2001
From: BuiDang <bdangvn@gmail.com>
Date: Thu, 24 Nov 2016 07:00:36 +0700
Subject: [PATCH] update version

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/app/index.html b/app/index.html
index 9b87eb2..8010536 100644
--- a/app/index.html
+++ b/app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '22-11_02';
+        var VERSION = '24-11_01';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 4373235..e7f3037 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -19,10 +19,16 @@ define(['app'], function (app) {
 		//Custom control
 		fabric.Object.prototype.transparentCorners = false;
 		fabric.Object.prototype.hasRotatingPoint = false;
+
+		// fabric.Canvas.prototype.__onMouseDown = function (e) {
+		// 	// return false;
+		// };
+
 		var ctrVisible = {tl: false, ml:false, bl:false, mb: false, br: true, mr: false, tr: true, mt: true, mtr: false};
 		for(key in ctrVisible) {
 			fabric.Object.prototype.setControlVisible(key,ctrVisible[key]);
 		}
+
 		fabric.Object.prototype.customiseCornerIcons({
 			settings: {
 				borderColor: '#0000ff',
@@ -45,13 +51,13 @@ define(['app'], function (app) {
 		fabric.Canvas.prototype.customiseControls({
 			mt: {
 				cursor: 'pointer',
-				// action: 'remove'
 				action: function(e, target) {
-					currentObj = canvas.getActiveObject();
 					if(confirm('削除してもよろしいですか?')) {
-						currentObj.remove();
+						if (canvas.getActiveObject()) {
+							canvas.remove(canvas.getActiveObject());
+						}
+						canvas.renderAll();
 					}
-
 				}
 			},
 			br: {
@@ -67,7 +73,6 @@ define(['app'], function (app) {
 			// console.log('after render');
 		});
 		canvas.on({
-			'mouse:up'          : mouseUp,
 			'object:added'      : onIllustrationAdded,
 			'object:moving'     : onIllustrationMoving,
 			'object:scaling'    : onIllustrationChange,
-- 
1.8.5.3