From 057ad34c679e4d4e1403d0d9ee13589780d659a3 Mon Sep 17 00:00:00 2001
From: root <mr.truongld@gmail.com>
Date: Tue, 29 Nov 2016 08:02:12 +0000
Subject: [PATCH] fix clear color SVG

---
 app/index.html                          |  2 +-
 app/scripts/controllers/tshirtdesign.js | 90 +++++++++++++++++++++++++--------
 2 files changed, 71 insertions(+), 21 deletions(-)

diff --git a/app/index.html b/app/index.html
index fe115e7..3eb1202 100644
--- a/app/index.html
+++ b/app/index.html
@@ -47,7 +47,7 @@
     <script src="bower_components/json3/lib/json3.min.js"></script>
     <![endif]-->
     <script type="text/javascript">
-        var VERSION = '28-11_01';
+        var VERSION = '28-11_02';
         var require = {
           urlArgs: "ver="+VERSION,
         };
diff --git a/app/scripts/controllers/tshirtdesign.js b/app/scripts/controllers/tshirtdesign.js
index f96b1a7..41d6976 100644
--- a/app/scripts/controllers/tshirtdesign.js
+++ b/app/scripts/controllers/tshirtdesign.js
@@ -6,6 +6,7 @@ define(['app'], function (app) {
 		var diffX = 40, diffY = 40;
 		var _coorTrash_x = 567;
 		var _coorTrash_y = 545;
+		var ObjectOrd=0;
 		//Set width and height canvas
 		function setSizeCanvas() {
 			if(typeof $rootScope.placeTshirt.place == 'undefined')
@@ -169,7 +170,7 @@ define(['app'], function (app) {
 		    }
 		    object.saveState();
 		
-		    console.log(object.originalState);
+		    // console.log(object.originalState);
 		    stateObj[indexCurr] = JSON.stringify(object.originalState);
 		    listObj[indexCurr] = object;
 		    indexCurr++;
@@ -188,16 +189,20 @@ define(['app'], function (app) {
 			}
 			
 			//
-			var objOffset = canvas.getActiveObject().getBoundingRect();
-			var cH = canvas.height, cW = canvas.width, H0 = 20, W0 = 20;
-			//console.log(objOffset,canvas.height,canvas.width);
-			if (objOffset.left<W0-objOffset.width || objOffset.left>cW-W0 || objOffset.top<H0-objOffset.height || objOffset.top>cH-H0){
-				if (confirm('削除してもよろしいですか')){
-					canvas.getActiveObject().remove();
-				}else{
-					undoCanvas();
-					return;
+			try{
+				var objOffset = canvas.getActiveObject().getBoundingRect();
+				var cH = canvas.height, cW = canvas.width, H0 = 20, W0 = 20;
+				//console.log(objOffset,canvas.height,canvas.width);
+				if (objOffset.left<W0-objOffset.width || objOffset.left>cW-W0 || objOffset.top<H0-objOffset.height || objOffset.top>cH-H0){
+					if (confirm('削除してもよろしいですか')){
+						canvas.getActiveObject().remove();
+					}else{
+						undoCanvas();
+						return;
+					}
 				}
+			}catch (e){
+				//
 			}
 			
 			var object = options.target;
@@ -300,12 +305,19 @@ define(['app'], function (app) {
 		$scope.canvasClearAll = function(){
 			if (confirm('配置されたすべての文字や画像を消去します')){
 				canvas.clear();
+				ObjectOrd = 0;
 			}
 		}
 
 		function onObjectSelected(options) {
 			var currentObj = options.target;
-
+			if (typeof currentObj.toOrd() != 'number'){
+				var currentObjOrd = ++ObjectOrd;
+				currentObj.toOrd = function(){
+					return currentObjOrd;
+				}
+			}
+			console.log(currentObj.toOrd());
 			$scope.typeObject = currentObj.type;
 			switch ($scope.typeObject) {
 				case 'i-text' :
@@ -337,9 +349,15 @@ define(['app'], function (app) {
 			$scope.currentIllustrationCate = $illustration.getList(currentIllustration);
 		};
 
+		var arrSvgOriginal = [];
 		$scope.insertSvg = function(item){
 			fabric.loadSVGFromURL(item.path, function(objects, options) {
 				var shape = fabric.util.groupSVGElements(objects, options);
+				var currentObjOrd = ++ObjectOrd;
+				arrSvgOriginal[currentObjOrd] = item.path;
+				shape.toOrd = function(){
+					return currentObjOrd;
+				}
 				canvas.add(shape.scale(0.6));
 				shape.set({ left: 150, top: 100 }).setCoords();
 				canvas.renderAll();
@@ -359,16 +377,41 @@ define(['app'], function (app) {
 			var obj = canvas.getActiveObject();
 			if (!color){
 				color = 'none';
+				// console.log(obj.toOrd(), arrSvgOriginal[obj.toOrd()]);
+				if (typeof obj.toOrd() == 'number' && typeof arrSvgOriginal[obj.toOrd()] != 'undefined'){
+					var currentObjOrd = obj.toOrd();
+					fabric.loadSVGFromURL(arrSvgOriginal[obj.toOrd()], function(objects, options) {
+						var shape = fabric.util.groupSVGElements(objects, options);
+						shape.toOrd = function(){
+							return currentObjOrd;
+						}
+						obj.setCoords();
+						shape.setScaleX(obj.getScaleX());
+						shape.setScaleY(obj.getScaleY());
+						shape.set('top',obj.getTop());
+						shape.set('left',obj.getLeft());
+						shape.set('angle',obj.getAngle());
+						// shape.set('height',obj.getHeight());
+						// shape.set('width',obj.getWidth());
+						canvas.add(shape);
+						shape.setCoords();
+						// shape.set({ left: 150, top: 100 }).setCoords();
+						canvas.renderAll();
+						canvas.setActiveObject(shape);
+						obj.remove();
+					});
+				}
+			}else{
+				if (obj instanceof fabric.PathGroup) {
+					obj.getObjects().forEach(function(o) {
+						o.fill = color;
+					});
+				}
+				else {
+					obj.fill = color;
+				}
+				canvas.renderAll();
 			}
-			if (obj instanceof fabric.PathGroup) {
-			  obj.getObjects().forEach(function(o) {
-			  	o.fill = color;
-			  });
-			}
-			else {
-			  obj.fill = color;
-			}
-			canvas.renderAll();
 		};
 		
 		//Font
@@ -685,6 +728,13 @@ define(['app'], function (app) {
 			}
 			$('#tshirt-design-saved').modal('hide');
 			canvas.loadFromJSON(item.data,canvas.renderAll.bind(canvas));
+			ObjectOrd = 0;
+			canvas.forEachObject(function(obj){
+				var currentObjOrd = ++ObjectOrd;
+			    obj.toOrd = function(){
+			    	return currentObjOrd;
+			    }
+			});
 		}
 		
 		$scope.deleteFavorite = function(idx){
-- 
1.8.5.3