From c3bee6bb30f09df67ade7eea0478afdc44c35a48 Mon Sep 17 00:00:00 2001
From: root <mr.truongld@gmail.com>
Date: Mon, 21 Nov 2016 14:15:22 +0000
Subject: [PATCH] fix trash icon effection

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 22 ++++++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/index.html b/app/index.html
index daf0b2c..0b16590 100644
--- a/app/index.html
+++ b/app/index.html
@@ -46,7 +46,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '19-11_02';
+        var VERSION = '21-11_02';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 52a26b6..17838a9 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -10,7 +10,7 @@ define(['app'], function (app) {
 		});
 		canvas.on({
 			'object:added'      : onIllustrationAdded,
-			'object:moving'     : onIllustrationChange,
+			'object:moving'     : onIllustrationMoving,
 			'object:scaling'    : onIllustrationChange,
 			'object:rotating'   : onIllustrationChange,
 			'object:selected'   : onObjectSelected,
@@ -50,8 +50,17 @@ define(['app'], function (app) {
 		}
 		
 		function onIllustrationModifield(options){
+			//
+		    var pointer = canvas.getPointer(options.e);
+			if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
+				canvas.getActiveObject().remove();
+				$('.design-content .trash-design').css({'opacity':'1'});
+				return;
+			}
+			
+			//
 			var objOffset = canvas.getActiveObject().getBoundingRect();
-			var cH = canvas.height, cW = canvas.width, H0 = 50, W0 = 50;
+			var cH = canvas.height, cW = canvas.width, H0 = 20, W0 = 20;
 			//console.log(objOffset,canvas.height,canvas.width);
 			if (objOffset.left<W0-objOffset.width || objOffset.left>cW-W0 || objOffset.top<H0-objOffset.height || objOffset.top>cH-H0){
 				if (confirm('削除してもよろしいですか')){
@@ -90,6 +99,15 @@ define(['app'], function (app) {
 			// 	obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1);
 			// });
 		}
+		
+		function onIllustrationMoving(options) {
+			var pointer = canvas.getPointer(options.e);
+			if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
+				$('.design-content .trash-design').css({'opacity':'0.5'});
+			}else{
+				$('.design-content .trash-design').css({'opacity':'1'});
+			}
+		}
 
 		function onObjectOut() {
 			delete currentObj;
-- 
1.8.5.3