From a9219e46a8b0a029818c923002e88977ea06c427 Mon Sep 17 00:00:00 2001
From: Alexis Deveria <adeveria@gmail.com>
Date: Fri, 9 Apr 2010 16:01:09 +0000
Subject: [PATCH] Fixed issue 528. Also made undo/redo work on image href
 change (was apparently broken)

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1514 eee81c28-f429-11dd-99c0-75d572ba1ddd
---
 editor/svg-editor.js |  1 +
 editor/svgcanvas.js  | 45 ++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index 5e4d9c8b..f2e9241e 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -2395,6 +2395,7 @@
 		
 			function setImageURL(url) {
 				if(!url) url = default_img_url;
+				
 				svgCanvas.setImageURL(url);
 				$('#image_url').val(url);
 				
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index 84ce082f..3b99d94e 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -197,6 +197,7 @@ function ChangeElementCommand(elem, attrs, text) {
 	this.oldValues = attrs;
 	for (var attr in attrs) {
 		if (attr == "#text") this.newValues[attr] = elem.textContent;
+		else if (attr == "#href") this.newValues[attr] = elem.getAttributeNS(xlinkns, "href");
 		else this.newValues[attr] = elem.getAttribute(attr);
 	}
 
@@ -205,6 +206,7 @@ function ChangeElementCommand(elem, attrs, text) {
 		for(var attr in this.newValues ) {
 			if (this.newValues[attr]) {
 				if (attr == "#text") this.elem.textContent = this.newValues[attr];
+				else if (attr == "#href") this.elem.setAttributeNS(xlinkns, "xlink:href", this.newValues[attr])
 				else this.elem.setAttribute(attr, this.newValues[attr]);
 			}
 			else {
@@ -241,6 +243,7 @@ function ChangeElementCommand(elem, attrs, text) {
 		for(var attr in this.oldValues ) {
 			if (this.oldValues[attr]) {
 				if (attr == "#text") this.elem.textContent = this.oldValues[attr];
+				else if (attr == "#href") this.elem.setAttributeNS(xlinkns, "xlink:href", this.oldValues[attr]);
 				else this.elem.setAttribute(attr, this.oldValues[attr]);
 			}
 			else {
@@ -3634,7 +3637,8 @@ function BatchCommand(text) {
 				case "rect":
 				case "image":
 					var attrs = $(element).attr(["width", "height"]);
-					keep = (attrs.width != 0 || attrs.height != 0);
+					// Image should be kept regardless of size (use inherit dimensions later)
+					keep = (attrs.width != 0 || attrs.height != 0) || current_mode === "image";
 					break;
 				case "circle":
 					keep = (element.getAttribute('r') != 0);
@@ -7430,7 +7434,44 @@ function BatchCommand(text) {
 	};
 
 	this.setImageURL = function(val) {
-		svgCanvas.changeSelectedAttribute("#href", val);
+		var elem = selectedElements[0];
+		if(!elem) return;
+		
+		var attrs = $(elem).attr(['width', 'height']);
+		var setsize = (!attrs.width || !attrs.height);
+
+		var cur_href = elem.getAttributeNS(xlinkns, "href");
+		
+		// Do nothing if no URL change or size change
+		if(cur_href !== val) {
+			setsize = true;
+		} else if(!setsize) return;
+
+		var batchCmd = new BatchCommand("Change Image URL");
+	
+		elem.setAttributeNS(xlinkns, "xlink:href", val);
+		batchCmd.addSubCommand(new ChangeElementCommand(elem, {
+			"#href": cur_href
+		}));
+	
+		if(setsize) {
+			$(new Image()).load(function() {
+				var changes = $(elem).attr(['width', 'height']);
+			
+				$(elem).attr({
+					width: this.width,
+					height: this.height
+				});
+				
+				selectorManager.requestSelector(elem).resize();
+				
+				batchCmd.addSubCommand(new ChangeElementCommand(elem, changes));
+				addCommandToHistory(batchCmd);
+				call("changed", elem);
+			}).attr('src',val);
+		} else {
+			addCommandToHistory(batchCmd);
+		}
 	};
 
 	this.setRectRadius = function(val) {