From 0181c19ffccaf64d61587228e4116364e0597e73 Mon Sep 17 00:00:00 2001
From: root <mr.truongld@gmail.com>
Date: Sun, 20 Nov 2016 10:24:22 +0000
Subject: [PATCH] fix bugs and optimal.

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 14 +++++++++-----
 app/views/main.html                     |  2 +-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/index.html b/app/index.html
index 78af3c7..daf0b2c 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 = '20-11_01';
+        var VERSION = '19-11_02';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index bafd4d4..f6f2941 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -6,7 +6,7 @@ define(['app'], function (app) {
 		fabric.Object.prototype.transparentCorners = false;
 
 		canvas.on('after:render', function() {
-			console.log('after render');
+			// console.log('after render');
 		});
 		canvas.on({
 			'object:added'      : onIllustrationAdded,
@@ -29,7 +29,7 @@ define(['app'], function (app) {
 		
 		function onIllustrationAdded(options){
 			var object = options.target;
-		    console.log('object:added');
+		    // console.log('object:added');
 		
 		    if (actionObj === true) {
 		        stateObj = [stateObj[indexCurr2]];
@@ -63,7 +63,7 @@ define(['app'], function (app) {
 			}
 			
 			var object = options.target;
-		    console.log('object:modified');
+		    // console.log('object:modified');
 		    if (actionObj === true) {
 		        stateObj = [stateObj[indexCurr2]];
 		        listObj = [listObj[indexCurr2]];
@@ -385,9 +385,13 @@ define(['app'], function (app) {
 		
 		/**** process insert image */
 		$scope.chooseImage = function(e){console.log(e);
+			if (e.target.files[0] && e.target.files[0].size > 5*1024*1024){
+				alert('file size much be <= 5MB');
+				return;
+			}
 			var reader = new FileReader();
-		    reader.onload = function (event) { console.log('fdsf');
-		        var imgObj = new Image();
+		    reader.onload = function (event) {
+		        var imgObj = new Image();//console.log(event.target);
 		        imgObj.src = event.target.result;
 		        imgObj.onload = function () {
 		            // start fabricJS stuff
diff --git a/app/views/main.html b/app/views/main.html
index 7e63774..520116a 100644
--- a/app/views/main.html
+++ b/app/views/main.html
@@ -149,7 +149,7 @@
           </div>
           <div class="tshirt-image">
             <img ng-src="{{ tShirtImg }}" alt="" />
-            <div id="preview-design" onClick="$('#tshirt-design').modal('show');">
+            <div id="preview-design" ng-click="modalTShirtDesign()">
               <img ng-src="{{outputImage}}" ng-show="outputImage"/>
             </div>
           </div>
-- 
1.8.5.3