TRUONG / T-Shats Frontend

Compare View

switch
from
...
to
 
Commits (2)

Changes

Showing 5 changed files Side-by-side Diff

app/images/trash-hover.png
Diff comments   View file @ 1be40f0

2.77 KB
app/images/trash.png
Diff comments   View file @ 1be40f0

2.46 KB | W: | H:

2.46 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
... ... @@ -47,7 +47,7 @@
47 47 <script src="bower_components/json3/lib/json3.min.js"></script>
48 48 <![endif]-->
49 49 <script type="text/javascript">
50   - var VERSION = '21-11_05';
  50 + var VERSION = '22-11_01';
51 51 var require = {
52 52 urlArgs: "ver="+VERSION,
53 53 };
app/scripts/controllers/tshirtdesign.js
Diff comments   View file @ 1be40f0
... ... @@ -107,7 +107,7 @@ define([&#39;app&#39;], function (app) {
107 107 var pointer = canvas.getPointer(options.e);
108 108 if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
109 109 canvas.getActiveObject().remove();
110   - $('.design-content .trash-design').css({'opacity':'1'});
  110 + $('.design-content .trash-design img').attr({'src':'images/trash.png'});
111 111 return;
112 112 }
113 113  
... ... @@ -156,9 +156,9 @@ define([&#39;app&#39;], function (app) {
156 156 function onIllustrationMoving(options) {
157 157 var pointer = canvas.getPointer(options.e);
158 158 if (pointer.x >= 567 && pointer.y >= 620 && pointer.x <= 600 && pointer.y <= 670){
159   - $('.design-content .trash-design').css({'opacity':'0.5'});
  159 + $('.design-content .trash-design img').attr({'src':'images/trash-hover.png'});
160 160 }else{
161   - $('.design-content .trash-design').css({'opacity':'1'});
  161 + $('.design-content .trash-design img').attr({'src':'images/trash.png'});
162 162 }
163 163 }
164 164  
app/views/tshirt-design.html
Diff comments   View file @ 1be40f0
... ... @@ -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>