deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-02-18 11:07:59 -06:00
parent 1654316557 9eb0573eca
commit fa662e8f51
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
public/svg-edit/editor/svgcanvas.js
View file

@ -1380,7 +1380,7 @@ function BatchCommand(text) {
// TODO: we simply check if the first character is a #, is this bullet-proof? // TODO: we simply check if the first character is a #, is this bullet-proof?
if (href[0] != "#") { if (href[0] != "#") {
// remove the attribute (but keep the element) // remove the attribute (but keep the element)
node.setAttributeNS(xlinkns, "href", ""); node.setAttributeNS(xlinkns, "xlink:href", "");
node.removeAttributeNS(xlinkns, "href"); node.removeAttributeNS(xlinkns, "href");
} }
} }
@ -2950,7 +2950,7 @@ function BatchCommand(text) {
"style": "pointer-events:inherit" "style": "pointer-events:inherit"
} }
}); });
newImage.setAttributeNS(xlinkns, "href", last_good_img_url); newImage.setAttributeNS(xlinkns, "xlink:href", last_good_img_url);
preventClickDefault(newImage); preventClickDefault(newImage);
break; break;
case "square": case "square":
@ -5599,7 +5599,7 @@ function BatchCommand(text) {
if(m) { if(m) {
var url = decodeURIComponent(m[1]); var url = decodeURIComponent(m[1]);
$(new Image()).load(function() { $(new Image()).load(function() {
image.setAttributeNS(xlinkns,'href',url); image.setAttributeNS(xlinkns,'xlink:href',url);
}).attr('src',url); }).attr('src',url);
} }
} }
@ -6887,7 +6887,7 @@ function BatchCommand(text) {
// } // }
} else if (attr == "#href") { } else if (attr == "#href") {
elem.setAttributeNS(xlinkns, "href", newValue); elem.setAttributeNS(xlinkns, "xlink:href", newValue);
} }
else elem.setAttribute(attr, newValue); else elem.setAttribute(attr, newValue);
if (i==0) if (i==0)
@ -7658,7 +7658,7 @@ function BatchCommand(text) {
'style':'pointer-events:none' 'style':'pointer-events:none'
}); });
} }
bg_img.setAttributeNS(xlinkns, "href", url); bg_img.setAttributeNS(xlinkns, "xlink:href", url);
bg.appendChild(bg_img); bg.appendChild(bg_img);
} else if(bg_img) { } else if(bg_img) {
bg_img.parentNode.removeChild(bg_img); bg_img.parentNode.removeChild(bg_img);