From 593beb421581092a1bb5480277a9be6d595e1dcb Mon Sep 17 00:00:00 2001
From: Jeff Schiller <codedread@gmail.com>
Date: Tue, 26 Oct 2010 17:11:23 +0000
Subject: [PATCH] Move a few more functions into svgutils.js

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1822 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svgcanvas.js | 64 +++------------------------------------------
 editor/svgutils.js  | 62 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 59d945f8..bbf8b11d 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -1622,37 +1622,10 @@ var SVGEditTransformList = function(elem) {
 
 // Group: Helper functions
 
-// Function: walkTree
-// Walks the tree and executes the callback on each element in a top-down fashion
-//
-// Parameters:
-// elem - DOM element to traverse
-// cbFn - Callback function to run on each element
-function walkTree(elem, cbFn){
-	if (elem && elem.nodeType == 1) {
-		cbFn(elem);
-		var i = elem.childNodes.length;
-		while (i--) {
-			walkTree(elem.childNodes.item(i), cbFn);
-		}
-	}
-};
-
-// Function: walkTreePost
-// Walks the tree and executes the callback on each element in a depth-first fashion
-//
-// Parameters:
-// elem - DOM element to traverse
-// cbFn - Callback function to run on each element
-function walkTreePost(elem, cbFn) {
-	if (elem && elem.nodeType == 1) {
-		var i = elem.childNodes.length;
-		while (i--) {
-			walkTree(elem.childNodes.item(i), cbFn);
-		}
-		cbFn(elem);
-	}
-};
+// "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;
 
 // Function: assignAttributes
 // Assigns multiple attributes to an element.
@@ -2482,35 +2455,6 @@ var sanitizeSvg = this.sanitizeSvg = function(node) {
 	}
 };
 
-// Function: getUrlFromAttr
-// Extracts the URL from the url(...) syntax of some attributes.  
-// Three variants:
-// 	* <circle fill="url(someFile.svg#foo)" />
-//  * <circle fill="url('someFile.svg#foo')" />
-//  * <circle fill='url("someFile.svg#foo")' />
-//
-// Parameters:
-// attrVal - The attribute value as a string
-// 
-// Returns:
-// String with just the URL, like someFile.svg#foo
-var getUrlFromAttr = this.getUrlFromAttr = function(attrVal) {
-	if (attrVal) {		
-		// url("#somegrad")
-		if (attrVal.indexOf('url("') === 0) {
-			return attrVal.substring(5,attrVal.indexOf('"',6));
-		}
-		// url('#somegrad')
-		else if (attrVal.indexOf("url('") === 0) {
-			return attrVal.substring(5,attrVal.indexOf("'",6));
-		}
-		else if (attrVal.indexOf("url(") === 0) {
-			return attrVal.substring(4,attrVal.indexOf(')'));
-		}
-	}
-	return null;
-};
-
 // Function getRefElem
 // Get the reference element associated with the given attribute value
 //
diff --git a/editor/svgutils.js b/editor/svgutils.js
index a04823a5..4ae7f16e 100644
--- a/editor/svgutils.js
+++ b/editor/svgutils.js
@@ -257,4 +257,66 @@ svgedit.Utilities.bboxToObj = function(bbox) {
 	}
 };
 
+// Function: walkTree
+// Walks the tree and executes the callback on each element in a top-down fashion
+//
+// Parameters:
+// elem - DOM element to traverse
+// cbFn - Callback function to run on each element
+svgedit.Utilities.walkTree = function(elem, cbFn){
+	if (elem && elem.nodeType == 1) {
+		cbFn(elem);
+		var i = elem.childNodes.length;
+		while (i--) {
+			svgedit.Utilities.walkTree(elem.childNodes.item(i), cbFn);
+		}
+	}
+};
+
+// Function: walkTreePost
+// Walks the tree and executes the callback on each element in a depth-first fashion
+// TODO: FIXME: Shouldn't this be calling walkTreePost?
+//
+// Parameters:
+// elem - DOM element to traverse
+// cbFn - Callback function to run on each element
+svgedit.Utilities.walkTreePost = function(elem, cbFn) {
+	if (elem && elem.nodeType == 1) {
+		var i = elem.childNodes.length;
+		while (i--) {
+			svgedit.Utilities.walkTree(elem.childNodes.item(i), cbFn);
+		}
+		cbFn(elem);
+	}
+};
+
+// Function: getUrlFromAttr
+// Extracts the URL from the url(...) syntax of some attributes.  
+// Three variants:
+// 	* <circle fill="url(someFile.svg#foo)" />
+//  * <circle fill="url('someFile.svg#foo')" />
+//  * <circle fill='url("someFile.svg#foo")' />
+//
+// Parameters:
+// attrVal - The attribute value as a string
+// 
+// Returns:
+// String with just the URL, like someFile.svg#foo
+svgedit.Utilities.getUrlFromAttr = function(attrVal) {
+	if (attrVal) {		
+		// url("#somegrad")
+		if (attrVal.indexOf('url("') === 0) {
+			return attrVal.substring(5,attrVal.indexOf('"',6));
+		}
+		// url('#somegrad')
+		else if (attrVal.indexOf("url('") === 0) {
+			return attrVal.substring(5,attrVal.indexOf("'",6));
+		}
+		else if (attrVal.indexOf("url(") === 0) {
+			return attrVal.substring(4,attrVal.indexOf(')'));
+		}
+	}
+	return null;
+};
+
 })();
\ No newline at end of file