From 34bc623f0844309f42be3933388f29b609de4b5c Mon Sep 17 00:00:00 2001
From: Jeff Schiller <codedread@gmail.com>
Date: Wed, 23 Feb 2011 16:24:07 +0000
Subject: [PATCH] Migrate another few bits of code into path.js

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1997 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/path.js      | 22 ++++++++++++++++++++++
 editor/svgcanvas.js | 19 ++++---------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/editor/path.js b/editor/path.js
index 384b855d..e8f68401 100644
--- a/editor/path.js
+++ b/editor/path.js
@@ -44,6 +44,10 @@ var pathFuncs = [];
 
 var link_control_pts = true;
 
+// Stores references to paths via IDs.
+// TODO: Make this cross-document happy.
+var pathData = {};
+
 svgedit.path.setLinkControlPoints = function(lcp) {
 	link_control_pts = lcp;
 };
@@ -875,4 +879,22 @@ svgedit.path.Path.prototype.update = function() {
 	return this;
 };
 
+// TODO: This creates 
+svgedit.path.getPath_ = function(elem) {
+	var p = pathData[elem.id];
+	if(!p) p = pathData[elem.id] = new svgedit.path.Path(elem);
+	return p;
+};
+
+svgedit.path.removePath_ = function(id) {
+	if(id in pathData) delete pathData[id];
+};
+
+// ====================================
+// Public API starts here
+
+svgedit.path.clearData =  function() {
+	pathData = {};
+};
+
 })();
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 0b61c2a0..c7782ce4 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -3913,7 +3913,6 @@ var textActions = canvas.textActions = function() {
 var pathActions = canvas.pathActions = function() {
 	
 	var subpath = false;
-	var pathData = {};
 	var current_path;
 	var newPoint, firstCtrl;
 	
@@ -3958,13 +3957,6 @@ var pathActions = canvas.pathActions = function() {
 			call("selected", grips);
 		}
 
-	function getPath(elem) {
-		var p = pathData[elem.id];
-		if(!p) p = pathData[elem.id] = new svgedit.path.Path(elem);
-		return p;
-	}
-	
-	
 	var current_path = null,
 		drawn_path = null,
 		hasMoved = false;
@@ -4192,7 +4184,7 @@ var pathActions = canvas.pathActions = function() {
 					var id = getId();
 				
 					// Remove previous path object if previously created
-					if(id in pathData) delete pathData[id];
+					svgedit.path.removePath_(id);
 					
 					var newpath = getElem(id);
 					
@@ -4522,11 +4514,8 @@ var pathActions = canvas.pathActions = function() {
 			}
 			hasMoved = false;
 		},
-		clearData: function() {
-			pathData = {};
-		},
 		toEditMode: function(element) {
-			svgedit.path.path = getPath(element);
+			svgedit.path.path = svgedit.path.getPath_(element);
 			current_mode = "pathedit";
 			clearSelection();
 			svgedit.path.path.show(true).update();
@@ -4588,7 +4577,7 @@ var pathActions = canvas.pathActions = function() {
 			addCommandToHistory(batchCmd);
 
 			// Set matrix to null
-			getPath(elem).show(false).matrix = null; 
+			svgedit.path.getPath_(elem).show(false).matrix = null; 
 
 			this.clear();
 	
@@ -5952,7 +5941,7 @@ this.setSvgString = function(xmlString) {
 		// reset transform lists
 		svgedit.transformlist.resetListMap();
 		clearSelection();
-		pathActions.clearData();
+		svgedit.path.clearData();
 		svgroot.appendChild(selectorManager.selectorParentGroup);
 		
 		addCommandToHistory(batchCmd);