From 5e140062b8ff9f95a0f06bdda5432ec2b420c1c5 Mon Sep 17 00:00:00 2001
From: Jeff Schiller <codedread@gmail.com>
Date: Fri, 5 Nov 2010 14:59:59 +0000
Subject: [PATCH] Hide svgTransformLists from svgcanvas.  Fix test HTML file.

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1838 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svgcanvas.js        | 25 ++++++++-----------------
 editor/svgtransformlist.js | 14 ++++++++++++++
 2 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index b31402ae..5b17713f 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -643,9 +643,7 @@ var ChangeElementCommand = this.undoCmd.changeElement = function(elem, attrs, te
 		}		
 		
 		// Remove transformlist to prevent confusion that causes bugs like 575.
-		if (svgTransformLists[this.elem.id]) {
-			delete svgTransformLists[this.elem.id];
-		}	
+		svgedit.transformlist.removeElementFromListMap(this.elem);
 		
 		return true;
 	};
@@ -708,9 +706,7 @@ var RemoveElementCommand = this.undoCmd.removeElement = function(elem, parent, t
 	// Function: RemoveElementCommand.apply
 	// Re-removes the new element
 	this.apply = function() {	
-		if (svgTransformLists[this.elem.id]) {
-			delete svgTransformLists[this.elem.id];
-		}	
+		svgedit.transformlist.removeElementFromListMap(this.elem);
 	
 		this.parent = this.elem.parentNode;
 		this.elem = this.parent.removeChild(this.elem);
@@ -722,9 +718,7 @@ var RemoveElementCommand = this.undoCmd.removeElement = function(elem, parent, t
 	// Function: RemoveElementCommand.unapply
 	// Re-adds the new element
 	this.unapply = function() { 
-		if (svgTransformLists[this.elem.id]) {
-			delete svgTransformLists[this.elem.id];
-		}
+		svgedit.transformlist.removeElementFromListMap(this.elem);
 
 		this.parent.insertBefore(this.elem, this.elem.nextSibling);
 		
@@ -740,9 +734,7 @@ var RemoveElementCommand = this.undoCmd.removeElement = function(elem, parent, t
 	this.elements = function() { return [this.elem]; };
 	
 	// special hack for webkit: remove this element's entry in the svgTransformLists map
-	if (svgTransformLists[elem.id]) {
-		delete svgTransformLists[elem.id];
-	}
+	svgedit.transformlist.removeElementFromListMap(elem);
 }
 
 // Function: MoveElementCommand
@@ -1440,19 +1432,18 @@ var SelectorManager;
 	};
 }());
 
-// "Import" from svgtransformlist.js
+// import svgtransformlist.js
 var SVGEditTransformList = svgedit.transformlist.SVGTransformList;
-var svgTransformLists = svgedit.transformlist.transforms;
 var getTransformList = this.getTransformList = svgedit.transformlist.getTransformList;
 
-// "Import" from svgutils.js
+// import from svgutils.js
 var walkTree = this.walkTree = svgedit.Utilities.walkTree;
 var walkTreePost = this.walkTreePost = svgedit.Utilities.walkTreePost;
 var getUrlFromAttr = this.getUrlFromAttr = svgedit.Utilities.getUrlFromAttr;
 var getHref = this.getHref = svgedit.Utilities.getHref;
 var setHref = this.setHref = svgedit.Utilities.setHref;
 
-// "Import" from math.js.
+// import from math.js.
 var transformPoint = svgedit.math.transformPoint;
 var isIdentity = svgedit.math.isIdentity;
 var matrixMultiply = this.matrixMultiply = svgedit.math.matrixMultiply;
@@ -8163,7 +8154,7 @@ this.setSvgString = function(xmlString) {
 		current_zoom = 1;
 		
 		// reset transform lists
-		svgTransformLists = {};
+		svgedit.transformlist.resetListMap();
 		clearSelection();
 		pathActions.clearData();
 		svgroot.appendChild(selectorManager.selectorParentGroup);
diff --git a/editor/svgtransformlist.js b/editor/svgtransformlist.js
index a236e4e4..a627aa7b 100644
--- a/editor/svgtransformlist.js
+++ b/editor/svgtransformlist.js
@@ -53,6 +53,20 @@ function transformToString(xform) {
  */
 svgedit.transformlist.listMap = {};
 
+svgedit.transformlist.resetListMap = function() {
+	svgedit.transformlist.listMap = {};
+};
+
+/**
+ * Parameters:
+ * elem - a DOM Element
+ */
+svgedit.transformlist.removeElementFromListMap = function(elem) {
+	if (elem.id && svgedit.transformlist.listMap[elem.id]) {
+		delete svgedit.transformlist.listMap[elem.id];
+	}
+};
+
 
 // **************************************************************************************
 // SVGTransformList implementation for Webkit