update, fix trash icon

TRUONG
1 parent 010854c35d
Showing 5 changed files with 5 additions and 4 deletions Side-by-side Diff
app/images/trash-hover.png
app/images/trash.png
app/index.html
app/scripts/controllers/tshirtdesign.js
app/views/tshirt-design.html
@@ -46,7 +46,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '21-11_04';
+        var VERSION = '22-11_01';
         var require = {
           urlArgs: "ver="+VERSION,
         };
@@ -54,7 +54,7 @@
 		    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'});
+				$('.design-content .trash-design img').attr({'src':'images/trash.png'});
 				return;
 			}
  
  
@@ -103,9 +103,9 @@
 		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'});
+				$('.design-content .trash-design img').attr({'src':'images/trash-hover.png'});
 			}else{
-				$('.design-content .trash-design').css({'opacity':'1'});
+				$('.design-content .trash-design img').attr({'src':'images/trash.png'});
 			}
 		}
  
@@ -61,6 +61,7 @@
                             <!--<span ng-click="redoCanvas()" class="fa fa-repeat"> Redo</span><br>-->
                             <img src="images/trash.png" alt="trash design" />
                         </div>
+                        <img style="display:none" src="images/trash-hover.png" alt="trash-hover cache" />
                     </div>
                 </section>
             </div>
...	...	@@ -46,7 +46,7 @@
46	46	<script src="bower_components/json3/lib/json3.min.js"></script>
47	47	<![endif]-->
48	48	<script type="text/javascript">
49		- var VERSION = '21-11_04';
	49	+ var VERSION = '22-11_01';
50	50	var require = {
51	51	urlArgs: "ver="+VERSION,
52	52	};
...	...	@@ -54,7 +54,7 @@
54	54	var pointer = canvas.getPointer(options.e);
55	55	if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
56	56	canvas.getActiveObject().remove();
57		- $('.design-content .trash-design').css({'opacity':'1'});
	57	+ $('.design-content .trash-design img').attr({'src':'images/trash.png'});
58	58	return;
59	59	}
60	60
61	61
...	...	@@ -103,9 +103,9 @@
103	103	function onIllustrationMoving(options) {
104	104	var pointer = canvas.getPointer(options.e);
105	105	if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
106		- $('.design-content .trash-design').css({'opacity':'0.5'});
	106	+ $('.design-content .trash-design img').attr({'src':'images/trash-hover.png'});
107	107	}else{
108		- $('.design-content .trash-design').css({'opacity':'1'});
	108	+ $('.design-content .trash-design img').attr({'src':'images/trash.png'});
109	109	}
110	110	}
111	111
...	...	@@ -61,6 +61,7 @@
61	61	<!--<span ng-click="redoCanvas()" class="fa fa-repeat"> Redo</span><br>-->
62	62	<img src="images/trash.png" alt="trash design" />
63	63	</div>
	64	+ <img style="display:none" src="images/trash-hover.png" alt="trash-hover cache" />
64	65	</div>
65	66	</section>
66	67	</div>