diff --git a/app/scripts/controllers/main.js b/app/scripts/controllers/main.js index e5a2f13..915be57 100644 --- a/app/scripts/controllers/main.js +++ b/app/scripts/controllers/main.js @@ -24,16 +24,13 @@ define(['app'], function (app) { currentTShirtKey = _routeParams.tShirt - 1; if(typeof _routeParams.place != 'undefined') placeTShirtKey = _routeParams.place; - console.log(placeTShirtKey); - /** * Get all info TShirt * @param: id * @return: object */ - $scope.placeTshirt = $t_shirt.getTShirtPlace(currentTShirtKey, placeTShirtKey); - console.log($scope.placeTshirt); + $rootScope.placeTshirt = $t_shirt.getTShirtPlace(currentTShirtKey, placeTShirtKey); $scope.tShirtColor = $t_shirt.getTShirtColor(currentTShirtKey); $rootScope.tShirtColorCode = $scope.tShirtColor[tShirtColorFirstKey].code; $scope.tShirtColorName = $scope.tShirtColor[tShirtColorFirstKey].name; @@ -45,10 +42,24 @@ define(['app'], function (app) { * Set preview size and position */ function setSizePreViewDesign() { - var _widthPreviewDesign = $('#preview-design').width(); var _widthTShirtImage = $('.tshirt-image').width(); - var leftReviewDesign = _widthTShirtImage/2 - (_widthPreviewDesign/2); - $('#preview-design').css({left: leftReviewDesign}); + if(typeof $rootScope.placeTshirt.place == 'undefined') + return; + + var place = $rootScope.placeTshirt.place; + switch (place) { + case 't_shirt_p_1' : + var widthPreview = _widthTShirtImage/2.5; + var heihtPreview = _widthTShirtImage/2.5; + break; + case 't_shirt_p_2' : + var widthPreview = _widthTShirtImage/2.5; + var heihtPreview = _widthTShirtImage/4.5; + break; + default: + break; + } + $('#preview-design').css({width: widthPreview, height: heihtPreview}); } setSizePreViewDesign(); $(window).resize(function () { @@ -113,5 +124,7 @@ define(['app'], function (app) { $scope.modalClose = function(){ $('#tshirt-design').modal('hide'); }; + + }); }); diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js index 6de8679..8955e58 100644 --- a/app/scripts/controllers/tshirtdesign.js +++ b/app/scripts/controllers/tshirtdesign.js @@ -5,6 +5,7 @@ define(['app'], function (app) { var canvas = new fabric.Canvas('main-design-container'); //Set width and height canvas function setSizeCanvas() { + console.log($rootScope.placeTshirt); var _modalWidth = $('.modal-dialog').width(); var _windowWidth = window.innerWidth; if(_windowWidth > 762) { @@ -406,8 +407,6 @@ define(['app'], function (app) { // console.log('layerProcess'); var activeObject = canvas.getActiveObject(); - console.log(activeObject); - if (activeObject){ switch (mode) { case 1: diff --git a/app/scripts/services/tshirt.js b/app/scripts/services/tshirt.js index 35f95d7..e448f3f 100644 --- a/app/scripts/services/tshirt.js +++ b/app/scripts/services/tshirt.js @@ -17,7 +17,7 @@ define(['app'], function (app) { 'place' : 't_shirt_p_1' }, place_2 : { - 'face' : 'back', + 'face' : 'front', 'place' : 't_shirt_p_2' }, place_3 : { diff --git a/app/styles/main.css b/app/styles/main.css index cdf275c..0aa52de 100644 --- a/app/styles/main.css +++ b/app/styles/main.css @@ -719,8 +719,6 @@ aside .step .finish-design button{ } .tshirt-design-container .design-content .content .selection-design{ border: 1px solid #ff0000; - width: 100%; - height: 620px; } .tshirt-design-container .agree-design{ position: absolute; @@ -793,16 +791,6 @@ footer ul.nav-footer li a{ } } -@media (max-width: 1200px) { - -} - -@media (max-width: 990px) { - -} -@media (max-width: 762px) and (min-width: 600px) { - -} @media (max-width: 762px) { .modal-dialog{ margin: 0 0!important; diff --git a/app/styles/placedesign.css b/app/styles/placedesign.css index e39cc97..62cc01d 100644 --- a/app/styles/placedesign.css +++ b/app/styles/placedesign.css @@ -1,10 +1,6 @@ #preview-design { position: absolute; - width: 190px; - height: 200px; border: dashed 2px #DDD; - top: 180px; - /*left: 200px;*/ cursor: pointer; } @@ -12,21 +8,15 @@ width: 150px; } -@media (max-width: 1200px) { - #preview-design { - left: 155px; - } -} - -@media (max-width: 990px) { - #preview-design { - /*left: 115px;*/ - width: 110px; - height: 160px; - top: 110px; - } -} - .t_shirt_p_1{ - + left: 50%; + top: 50%; + transform: translateX(-50%) translateY(-50%); + -webkit-transform: translateX(-50%) translateY(-50%); +} +.t_shirt_p_2{ + left: 50%; + top: 80%; + transform: translateX(-50%) translateY(-80%); + -webkit-transform: translateX(-50%) translateY(-80%); } \ No newline at end of file diff --git a/app/views/main.html b/app/views/main.html index 490798a..a1afc1b 100644 --- a/app/views/main.html +++ b/app/views/main.html @@ -149,7 +149,7 @@
-
+
diff --git a/app/views/tshirt-design.html b/app/views/tshirt-design.html index f27cbab..0ffd2c5 100644 --- a/app/views/tshirt-design.html +++ b/app/views/tshirt-design.html @@ -1,6 +1,5 @@