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

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 16 +++++++---------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/index.html b/app/index.html
index 55710b3..3172746 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 = '24-11_03';
+        var VERSION = '24-11_04';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 69a432e..82474aa 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -12,10 +12,12 @@ define(['app'], function (app) {
 			var _contentCanvasWidth = _windowWidth-70;
 		}
 
-
+		console.log(canvas);
 		canvas.setWidth(_contentCanvasWidth);
 		canvas.setHeight(650);
-
+		canvas._onMouseDown = function () {
+			alert('in mouse up');
+		};
 		//Custom control
 		fabric.Object.prototype.transparentCorners = false;
 		fabric.Object.prototype.hasRotatingPoint = false;
@@ -38,7 +40,7 @@ define(['app'], function (app) {
 				cornerPadding: 6
 			},
 			mt: {
-				icon: 'images/control-icon/trash.png'
+				icon: 'images/control-icon/ok.png'
 			},
 			br: {
 				icon: 'images/control-icon/resize.png'
@@ -52,12 +54,7 @@ define(['app'], function (app) {
 			mt: {
 				cursor: 'pointer',
 				action: function(e, target) {
-					if(confirm('削除してもよろしいですか?')) {
-						if (canvas.getActiveObject()) {
-							canvas.remove(canvas.getActiveObject());
-						}
-						canvas.renderAll();
-					}
+					canvas.deactivateAll().renderAll();
 				}
 			},
 			br: {
@@ -259,6 +256,7 @@ define(['app'], function (app) {
 		function onObjectSelected(options) {
 			var currentObj = options.target;
 
+
 			$scope.typeObject = currentObj.type;
 			switch ($scope.typeObject) {
 				case 'i-text' :
-- 
1.8.5.3