update fix layer process

TRUONG
1 parent e32d6b2cb5
Showing 5 changed files with 30 additions and 6 deletions Side-by-side Diff
app/index.html
app/scripts/controllers/main.js
app/scripts/controllers/tshirtdesign.js
app/styles/main.css
app/views/design_part/illustration.html
@@ -46,7 +46,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '17-11_04';
+        var VERSION = new Date().getTime();//'17-11_04';
         var require = {
           urlArgs: "ver="+VERSION,
         };
 define(['app'], function (app) {
 	'use strict';
-	app.controller('MainCtrl', function ($rootScope, $scope, $illustration, $t_shirt) {
+	app.controller('MainCtrl', function ($rootScope, $scope, $timeout, $illustration, $t_shirt) {
 		$rootScope.API_URL = 'http://domain.com';
 		$scope.designFrameView = 'views/tshirt-design.html?ver='+VERSION;
 		$scope.designPartIllustration = 'views/design_part/illustration.html?ver='+VERSION;
@@ -50,6 +50,14 @@
 					$scope.illustrationSelectConfig = {
 						allowClear:true
 					};
+					$timeout(function(){
+						$('.illstration-item').tooltip({
+							animated: 'fade',
+						    placement: 'bottom',
+						    html: true
+						});
+						console.log('here');
+					},1000);
 					break;
 				}
 				case 'text': {
@@ -89,7 +89,6 @@
 			// if (obj === options.target) return;
 			// 	obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1);
 			// });
-
 		}
  
 		function onObjectOut() {
@@ -141,7 +140,7 @@
  
 		function onObjectSelected(options) {
 			var currentObj = options.target;
-			console.log(currentObj.text);
+			// console.log(currentObj.text);
 			$scope.typeObject = currentObj.type;
 			switch ($scope.typeObject) {
 				case 'i-text' :
@@ -292,7 +291,7 @@
 						activeObject.sendToBack();
 						break;
 				}
-    	        canvas.renderAll();
+				canvas.deactivateAll().renderAll();
 			}
 		};
  
@@ -600,7 +600,14 @@
 .aside #choice-illustration li .content .illustration-list .footer-bar .footer-pagination:hover {
   background: #999999;
 }
+.tooltip-arrow,
+.red-tooltip + .tooltip > .tooltip-inner {
+  background-color: #FFF;
+  margin:0;
+  padding:0;
+}
  
+/* Insert image*/
 #btn-choose-image {
   background: #ff0f00;
   cursor: pointer;
  
@@ -667,8 +674,12 @@
   right: 5px;
   bottom: 0;
 }
+.tshirt-design-container .trash-design:hover{
+  opacity: 0.5;
+}
  
  
+
 /*FOOTER*/
 footer{
   background-color: #333333;
@@ -698,5 +709,11 @@
 @media screen and (min-width: 768px) {
   /* Remove the padding we set earlier */
  
+}
+
+@media (min-width: 1024px) {
+  #tshirt-design .modal-dialog{
+    min-width: 1000px;
+  }
 }
@@ -8,7 +8,7 @@
             <option ng-repeat="(key,cate) in IllustrationList" value="{{key}}">{{cate.name}}</option>
         </select>
         <div class="illustration-list" ng-init="currentIllustrationPage=1;perIllustrationPage=16">
-            <div class="illstration-item" ng-repeat="item in currentIllustrationCate.list | limitTo:perIllustrationPage:((currentIllustrationPage-1)*perIllustrationPage)" ng-click="insertSvg(item)">
+            <div class="illstration-item" ng-repeat="item in currentIllustrationCate.list | limitTo:perIllustrationPage:((currentIllustrationPage-1)*perIllustrationPage)" ng-click="insertSvg(item)" title="<img src='{{item.path}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip">
                 <img ng-src="{{item.path}}"/>
             </div>
             <div class="clearfix"></div>
...	...	@@ -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 = '17-11_04';
	49	+ var VERSION = new Date().getTime();//'17-11_04';
50	50	var require = {
51	51	urlArgs: "ver="+VERSION,
52	52	};
1	1	define(['app'], function (app) {
2	2	'use strict';
3		- app.controller('MainCtrl', function ($rootScope, $scope, $illustration, $t_shirt) {
	3	+ app.controller('MainCtrl', function ($rootScope, $scope, $timeout, $illustration, $t_shirt) {
4	4	$rootScope.API_URL = 'http://domain.com';
5	5	$scope.designFrameView = 'views/tshirt-design.html?ver='+VERSION;
6	6	$scope.designPartIllustration = 'views/design_part/illustration.html?ver='+VERSION;
...	...	@@ -50,6 +50,14 @@
50	50	$scope.illustrationSelectConfig = {
51	51	allowClear:true
52	52	};
	53	+ $timeout(function(){
	54	+ $('.illstration-item').tooltip({
	55	+ animated: 'fade',
	56	+ placement: 'bottom',
	57	+ html: true
	58	+ });
	59	+ console.log('here');
	60	+ },1000);
53	61	break;
54	62	}
55	63	case 'text': {
...	...	@@ -89,7 +89,6 @@
89	89	// if (obj === options.target) return;
90	90	// obj.setOpacity(options.target.intersectsWithObject(obj) ? 0.5 : 1);
91	91	// });
92		-
93	92	}
94	93
95	94	function onObjectOut() {
...	...	@@ -141,7 +140,7 @@
141	140
142	141	function onObjectSelected(options) {
143	142	var currentObj = options.target;
144		- console.log(currentObj.text);
	143	+ // console.log(currentObj.text);
145	144	$scope.typeObject = currentObj.type;
146	145	switch ($scope.typeObject) {
147	146	case 'i-text' :
...	...	@@ -292,7 +291,7 @@
292	291	activeObject.sendToBack();
293	292	break;
294	293	}
295		- canvas.renderAll();
	294	+ canvas.deactivateAll().renderAll();
296	295	}
297	296	};
298	297
...	...	@@ -600,7 +600,14 @@
600	600	.aside #choice-illustration li .content .illustration-list .footer-bar .footer-pagination:hover {
601	601	background: #999999;
602	602	}
	603	+.tooltip-arrow,
	604	+.red-tooltip + .tooltip > .tooltip-inner {
	605	+ background-color: #FFF;
	606	+ margin:0;
	607	+ padding:0;
	608	+}
603	609
	610	+/* Insert image*/
604	611	#btn-choose-image {
605	612	background: #ff0f00;
606	613	cursor: pointer;
607	614
...	...	@@ -667,8 +674,12 @@
667	674	right: 5px;
668	675	bottom: 0;
669	676	}
	677	+.tshirt-design-container .trash-design:hover{
	678	+ opacity: 0.5;
	679	+}
670	680
671	681
	682	+
672	683	/FOOTER/
673	684	footer{
674	685	background-color: #333333;
...	...	@@ -698,5 +709,11 @@
698	709	@media screen and (min-width: 768px) {
699	710	/* Remove the padding we set earlier */
700	711
	712	+}
	713	+
	714	+@media (min-width: 1024px) {
	715	+ #tshirt-design .modal-dialog{
	716	+ min-width: 1000px;
	717	+ }
701	718	}
...	...	@@ -8,7 +8,7 @@
8	8	<option ng-repeat="(key,cate) in IllustrationList" value="{{key}}">{{cate.name}}</option>
9	9	</select>
10	10	<div class="illustration-list" ng-init="currentIllustrationPage=1;perIllustrationPage=16">
11		- <div class="illstration-item" ng-repeat="item in currentIllustrationCate.list \| limitTo:perIllustrationPage:((currentIllustrationPage-1)*perIllustrationPage)" ng-click="insertSvg(item)">
	11	+ <div class="illstration-item" ng-repeat="item in currentIllustrationCate.list \| limitTo:perIllustrationPage:((currentIllustrationPage-1)*perIllustrationPage)" ng-click="insertSvg(item)" title="<img src='{{item.path}}' style='width:200px;background:#e2e2e2;margin:0;padding:0;margin-left:-8px;border:0'/>" data-toggle="tooltip">
12	12	<img ng-src="{{item.path}}"/>
13	13	</div>
14	14	<div class="clearfix"></div>