From 360081503c102b4ec25b9ccbc6da5c8b4b12e252 Mon Sep 17 00:00:00 2001
From: BuiDang <bdangvn@gmail.com>
Date: Thu, 24 Nov 2016 20:18:37 +0700
Subject: [PATCH] Fix reponsive

---
 app/scripts/controllers/main.js         | 19 +++++++++++--------
 app/scripts/controllers/tshirtdesign.js | 32 +++++++++++++++++++-------------
 app/styles/main.css                     |  4 ++--
 3 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js
index 28a671f..b3645d8 100644
--- a/app/scripts/controllers/main.js
+++ b/app/scripts/controllers/main.js
@@ -22,14 +22,17 @@ define(['app'], function (app) {
 		$scope.tShirtImg = $scope.tShirtImgFront;
 
 		//review design set position
-		var _widthPreviewDesign = $('#preview-design').width();
-		var _widthTShirtImage = $('.tshirt-image').width();
-		console.log(_widthTShirtImage);
-		console.log(_widthPreviewDesign);
-		// $('#preview-design').css({width: _widthTShirtImage/2 - 60});
-		var leftReviewDesign = _widthTShirtImage/2 - (_widthPreviewDesign/2 - 10);
-		$('#preview-design').css({left: leftReviewDesign});
-
+		function setSizePreViewDesign() {
+			var _widthPreviewDesign = $('#preview-design').width();
+			var _widthTShirtImage = $('.tshirt-image').width();
+			var leftReviewDesign = _widthTShirtImage/2 - (_widthPreviewDesign/2);
+			$('#preview-design').css({left: leftReviewDesign});
+		}
+		setSizePreViewDesign();
+		//event resize window
+		$(window).resize(function () {
+			setSizePreViewDesign();
+		});
 
 		$scope.choiceTShirtColor = function(key) {
 			$scope.tShirtColorKey = key;
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index 10e0d05..2fca8ec 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -4,20 +4,25 @@ define(['app'], function (app) {
 
 		var canvas = new fabric.Canvas('main-design-container');
 		//Set width and height canvas
-		var _modalWidth = $('.modal-dialog').width();
-		var _windowWidth = window.innerWidth;
-		if(_windowWidth > 762) {
-			var _contentCanvasWidth = _modalWidth*8/12 - 100;
-		} else {
-			var _contentCanvasWidth = _windowWidth-70;
+		function setSizeCanvas() {
+			var _modalWidth = $('.modal-dialog').width();
+			var _windowWidth = window.innerWidth;
+			if(_windowWidth > 762) {
+				var _contentCanvasWidth = _modalWidth*8/12 - 100;
+			} else {
+				var _contentCanvasWidth = _windowWidth-70;
+			}
+
+			canvas.setWidth(_contentCanvasWidth);
+			canvas.setHeight(650);
 		}
+		setSizeCanvas();
+		//Window resize event
+		$(window).resize(function () {
+			setSizeCanvas();
+		});
+
 
-		console.log(canvas);
-		canvas.setWidth(_contentCanvasWidth);
-		canvas.setHeight(650);
-		canvas._onMouseDown = function () {
-			alert('in mouse up');
-		};
 		//Custom control
 		fabric.Object.prototype.transparentCorners = true;
 		fabric.Object.prototype.hasRotatingPoint = false;
@@ -57,6 +62,8 @@ define(['app'], function (app) {
 				action: function(e, target) {
 					fabric.Object.prototype.selectable = false;
 					canvas.deactivateAll();
+					delete currentObj;
+					$scope.designTextValue = '';
 					$timeout(function(){
 						fabric.Object.prototype.selectable = true;
 					},20);
@@ -185,7 +192,6 @@ define(['app'], function (app) {
 		    listObj[indexCurr] = object;
 		    indexCurr++;
 		    indexCurr2 = indexCurr - 1;
-		    // console.log(stateObj);
 		    refreshObj = true;
 		}
 		
diff --git a/app/styles/main.css b/app/styles/main.css
index 8353823..eea486d 100644
--- a/app/styles/main.css
+++ b/app/styles/main.css
@@ -815,8 +815,8 @@ footer ul.nav-footer li a{
   #preview-design {
     /*left: 115px;*/
     width: 110px;
-    height: 200px;
-    top: 100px;
+    height: 160px;
+    top: 110px;
   }
 }
 
-- 
1.8.5.3