TRUONG / T-Shats Frontend

Download as
Browse Code ยป

Commit 0181c19ffccaf64d61587228e4116364e0597e73

Authored by TRUONG
1 parent 80ff9bbd4d
Exists in master and in 1 other branch develop

fix bugs and optimal.

Showing 3 changed files with 11 additions and 7 deletions Side-by-side Diff

... ... @@ -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 = '20-11_01';
  49 + var VERSION = '19-11_02';
50 50 var require = {
51 51 urlArgs: "ver="+VERSION,
52 52 };
app/scripts/controllers/tshirtdesign.js
Diff comments   View file @ 0181c19
... ... @@ -6,7 +6,7 @@
6 6 fabric.Object.prototype.transparentCorners = false;
7 7  
8 8 canvas.on('after:render', function() {
9   - console.log('after render');
  9 + // console.log('after render');
10 10 });
11 11 canvas.on({
12 12 'object:added' : onIllustrationAdded,
... ... @@ -29,7 +29,7 @@
29 29  
30 30 function onIllustrationAdded(options){
31 31 var object = options.target;
32   - console.log('object:added');
  32 + // console.log('object:added');
33 33  
34 34 if (actionObj === true) {
35 35 stateObj = [stateObj[indexCurr2]];
... ... @@ -63,7 +63,7 @@
63 63 }
64 64  
65 65 var object = options.target;
66   - console.log('object:modified');
  66 + // console.log('object:modified');
67 67 if (actionObj === true) {
68 68 stateObj = [stateObj[indexCurr2]];
69 69 listObj = [listObj[indexCurr2]];
70 70  
... ... @@ -385,9 +385,13 @@
385 385  
386 386 /**** process insert image */
387 387 $scope.chooseImage = function(e){console.log(e);
  388 + if (e.target.files[0] && e.target.files[0].size > 5*1024*1024){
  389 + alert('file size much be <= 5MB');
  390 + return;
  391 + }
388 392 var reader = new FileReader();
389   - reader.onload = function (event) { console.log('fdsf');
390   - var imgObj = new Image();
  393 + reader.onload = function (event) {
  394 + var imgObj = new Image();//console.log(event.target);
391 395 imgObj.src = event.target.result;
392 396 imgObj.onload = function () {
393 397 // start fabricJS stuff
... ... @@ -149,7 +149,7 @@
149 149 </div>
150 150 <div class="tshirt-image">
151 151 <img ng-src="{{ tShirtImg }}" alt="" />
152   - <div id="preview-design" onClick="$('#tshirt-design').modal('show');">
  152 + <div id="preview-design" ng-click="modalTShirtDesign()">
153 153 <img ng-src="{{outputImage}}" ng-show="outputImage"/>
154 154 </div>
155 155 </div>