github/svgedit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Made new image URL start out empty when changing a data URL, removed part of imagelib description

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1661 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-08-16 17:53:15 +00:00
parent 7776034753
commit 11a318de72
3 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
editor/extensions/ext-imagelib.js
View File

@@ -17,7 +17,7 @@ svgEditor.addExtension("imagelib", function() {
{ {
name: 'IAN Symbol Libraries', name: 'IAN Symbol Libraries',
url: 'http://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php', url: 'http://ian.umces.edu/symbols/catalog/svgedit/album_chooser.php',
description: 'Free library of 2300+ illustrations' description: 'Free library of illustrations'
} }
]; ];

12
editor/svg-editor.js
View File

@@ -1345,10 +1345,8 @@
if(svgCanvas.addedNew) { if(svgCanvas.addedNew) {
if(elname == 'image') { if(elname == 'image') {
var xlinkNS = "http://www.w3.org/1999/xlink";
var href = elem.getAttributeNS(xlinkNS, "href");
// Prompt for URL if not a data URL // Prompt for URL if not a data URL
if(href.indexOf('data:') !== 0) { if(svgCanvas.getHref(elem).indexOf('data:') !== 0) {
promptImgURL(); promptImgURL();
} }
} else if(elname == 'text') { } else if(elname == 'text') {
@@ -1455,9 +1453,7 @@
} }
} // text } // text
else if(el_name == 'image') { else if(el_name == 'image') {
var xlinkNS="http://www.w3.org/1999/xlink"; setImageURL(svgCanvas.getHref(elem));
var href = elem.getAttributeNS(xlinkNS, "href");
setImageURL(href);
} // image } // image
else if(el_name == 'g' || el_name == 'use') { else if(el_name == 'g' || el_name == 'use') {
$('#container_panel').show(); $('#container_panel').show();
@@ -2908,7 +2904,9 @@
$('#change_image_url').click(promptImgURL); $('#change_image_url').click(promptImgURL);
function promptImgURL() { function promptImgURL() {
$.prompt(uiStrings.enterNewImgURL, default_img_url, function(url) { var curhref = svgCanvas.getHref(selectedElement);
curhref = curhref.indexOf("data:") === 0?"":curhref;
$.prompt(uiStrings.enterNewImgURL, curhref, function(url) {
if(url) setImageURL(url); if(url) setImageURL(url);
}); });
} }

53
editor/svgcanvas.js
View File

@@ -663,7 +663,7 @@ var ChangeElementCommand = this.undoCmd.changeElement = function(elem, attrs, te
this.oldValues = attrs; this.oldValues = attrs;
for (var attr in attrs) { for (var attr in attrs) {
if (attr == "#text") this.newValues[attr] = elem.textContent; if (attr == "#text") this.newValues[attr] = elem.textContent;
else if (attr == "#href") this.newValues[attr] = elem.getAttributeNS(xlinkns, "href"); else if (attr == "#href") this.newValues[attr] = getHref(elem);
else this.newValues[attr] = elem.getAttribute(attr); else this.newValues[attr] = elem.getAttribute(attr);
} }
@@ -674,7 +674,7 @@ var ChangeElementCommand = this.undoCmd.changeElement = function(elem, attrs, te
for(var attr in this.newValues ) { for(var attr in this.newValues ) {
if (this.newValues[attr]) { if (this.newValues[attr]) {
if (attr == "#text") this.elem.textContent = 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 if (attr == "#href") setHref(this.elem, this.newValues[attr])
else this.elem.setAttribute(attr, this.newValues[attr]); else this.elem.setAttribute(attr, this.newValues[attr]);
} }
else { else {
@@ -716,7 +716,7 @@ var ChangeElementCommand = this.undoCmd.changeElement = function(elem, attrs, te
for(var attr in this.oldValues ) { for(var attr in this.oldValues ) {
if (this.oldValues[attr]) { if (this.oldValues[attr]) {
if (attr == "#text") this.elem.textContent = 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 if (attr == "#href") setHref(this.elem, this.oldValues[attr]);
else this.elem.setAttribute(attr, this.oldValues[attr]); else this.elem.setAttribute(attr, this.oldValues[attr]);
if (attr == "stdDeviation") canvas.setBlurOffsets(this.elem.parentNode, this.oldValues[attr]); if (attr == "stdDeviation") canvas.setBlurOffsets(this.elem.parentNode, this.oldValues[attr]);
@@ -1842,7 +1842,7 @@ var addSvgElementFromJson = this.addSvgElementFromJson = function(data) {
// var svgthumb = svgdoc.createElementNS(svgns, "use"); // var svgthumb = svgdoc.createElementNS(svgns, "use");
// svgthumb.setAttribute('width', '100'); // svgthumb.setAttribute('width', '100');
// svgthumb.setAttribute('height', '100'); // svgthumb.setAttribute('height', '100');
// svgthumb.setAttributeNS(xlinkns, 'href', '#svgcontent'); // setHref(svgthumb, '#svgcontent');
// svgroot.appendChild(svgthumb); // svgroot.appendChild(svgthumb);
})(); })();
@@ -2466,7 +2466,7 @@ var sanitizeSvg = this.sanitizeSvg = function(node) {
// for some elements that have a xlink:href, ensure the URI refers to a local element // for some elements that have a xlink:href, ensure the URI refers to a local element
// (but not for links) // (but not for links)
var href = node.getAttributeNS(xlinkns,"href"); var href = getHref(node);
if(href && if(href &&
$.inArray(node.nodeName, ["filter", "linearGradient", "pattern", $.inArray(node.nodeName, ["filter", "linearGradient", "pattern",
"radialGradient", "textPath", "use"]) != -1) "radialGradient", "textPath", "use"]) != -1)
@@ -2474,13 +2474,13 @@ var sanitizeSvg = this.sanitizeSvg = function(node) {
// 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, "xlink:href", ""); setHref(node, "");
node.removeAttributeNS(xlinkns, "href"); node.removeAttributeNS(xlinkns, "href");
} }
} }
// Safari crashes on a <use> without a xlink:href, so we just remove the node here // Safari crashes on a <use> without a xlink:href, so we just remove the node here
if (node.nodeName == "use" && !node.getAttributeNS(xlinkns,"href")) { if (node.nodeName == "use" && !getHref(node)) {
parent.removeChild(node); parent.removeChild(node);
return; return;
} }
@@ -3354,7 +3354,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
// var u = uses.length; // var u = uses.length;
// while (u--) { // while (u--) {
// var useElem = uses.item(u); // var useElem = uses.item(u);
// if(href == useElem.getAttributeNS(xlinkns, "href")) { // if(href == getHref(useElem)) {
// var usexlate = svgroot.createSVGTransform(); // var usexlate = svgroot.createSVGTransform();
// usexlate.setTranslate(-tx,-ty); // usexlate.setTranslate(-tx,-ty);
// getTransformList(useElem).insertItemBefore(usexlate,0); // getTransformList(useElem).insertItemBefore(usexlate,0);
@@ -3432,7 +3432,7 @@ var recalculateDimensions = this.recalculateDimensions = function(selected) {
var u = uses.length; var u = uses.length;
while (u--) { while (u--) {
var useElem = uses.item(u); var useElem = uses.item(u);
if(href == useElem.getAttributeNS(xlinkns, "href")) { if(href == getHref(useElem)) {
var usexlate = svgroot.createSVGTransform(); var usexlate = svgroot.createSVGTransform();
usexlate.setTranslate(-tx,-ty); usexlate.setTranslate(-tx,-ty);
getTransformList(useElem).insertItemBefore(usexlate,0); getTransformList(useElem).insertItemBefore(usexlate,0);
@@ -4365,7 +4365,7 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
"style": "pointer-events:inherit" "style": "pointer-events:inherit"
} }
}); });
newImage.setAttributeNS(xlinkns, "xlink:href", last_good_img_url); setHref(newImage, last_good_img_url);
preventClickDefault(newImage); preventClickDefault(newImage);
break; break;
case "square": case "square":
@@ -7422,7 +7422,7 @@ var removeUnusedDefElems = this.removeUnusedDefElems = function() {
} }
// gradients can refer to other gradients // gradients can refer to other gradients
var href = el.getAttributeNS(xlinkns, "href"); var href = getHref(el);
if (href && href.indexOf('#') == 0) { if (href && href.indexOf('#') == 0) {
defelem_uses.push(href.substr(1)); defelem_uses.push(href.substr(1));
} }
@@ -7806,7 +7806,7 @@ var uniquifyElems = this.uniquifyElems = function(g) {
}); });
// check xlink:href now // check xlink:href now
var href = n.getAttributeNS(xlinkns,"href"); var href = getHref(n);
// TODO: what if an <image> or <a> element refers to an element internally? // TODO: what if an <image> or <a> element refers to an element internally?
if(href && if(href &&
$.inArray(n.nodeName, ["filter", "linearGradient", "pattern", $.inArray(n.nodeName, ["filter", "linearGradient", "pattern",
@@ -7846,7 +7846,7 @@ var uniquifyElems = this.uniquifyElems = function(g) {
var k = hreffers.length; var k = hreffers.length;
while (k--) { while (k--) {
var hreffer = hreffers[k]; var hreffer = hreffers[k];
hreffer.setAttributeNS(xlinkns, "xlink:href", "#"+newid); setHref(hreffer, "#"+newid);
} }
} }
} }
@@ -7982,7 +7982,7 @@ this.setSvgString = function(xmlString) {
$(svgcontent).find('image').each(function() { $(svgcontent).find('image').each(function() {
var image = this; var image = this;
preventClickDefault(image); preventClickDefault(image);
var val = this.getAttributeNS(xlinkns, "href"); var val = getHref(this);
if(val.indexOf('data:') === 0) { if(val.indexOf('data:') === 0) {
// Check if an SVG-edit data URI // Check if an SVG-edit data URI
var m = val.match(/svgedit_url=(.*?);/); var m = val.match(/svgedit_url=(.*?);/);
@@ -8016,7 +8016,7 @@ this.setSvgString = function(xmlString) {
// Set ref element for <use> elements // Set ref element for <use> elements
$(svgcontent).find('use').each(function() { $(svgcontent).find('use').each(function() {
var id = this.getAttributeNS(xlinkns,"href").substr(1); var id = getHref(this).substr(1);
var ref_elem = getElem(id); var ref_elem = getElem(id);
$(this).data('ref', ref_elem); $(this).data('ref', ref_elem);
if(ref_elem.tagName == 'symbol' || ref_elem.tagName == 'svg') { if(ref_elem.tagName == 'symbol' || ref_elem.tagName == 'svg') {
@@ -8212,7 +8212,7 @@ this.importSvgString = function(xmlString) {
var use_el = svgdoc.createElementNS(svgns, "use"); var use_el = svgdoc.createElementNS(svgns, "use");
use_el.id = getNextId(); use_el.id = getNextId();
use_el.setAttributeNS(xlinkns, "xlink:href", "#" + symbol.id); setHref(use_el, "#" + symbol.id);
findDefs().appendChild(symbol); findDefs().appendChild(symbol);
current_layer.appendChild(use_el); current_layer.appendChild(use_el);
clearSelection(); clearSelection();
@@ -8742,6 +8742,19 @@ this.getTitle = function(elem) {
return ''; return '';
} }
// Function: getHref
// Returns the given element's xlink:href value
var getHref = this.getHref = function(elem) {
return elem.getAttributeNS(xlinkns, "href");
}
// Function: setHref
// Sets the given element's xlink:href value
var setHref = this.setHref = function(elem, val) {
elem.setAttributeNS(xlinkns, "xlink:href", val);
}
// Function: setGroupTitle // Function: setGroupTitle
// Sets the group/SVG's title content // Sets the group/SVG's title content
// TODO: Combine this with setDocumentTitle // TODO: Combine this with setDocumentTitle
@@ -9596,7 +9609,7 @@ this.setImageURL = function(val) {
var attrs = $(elem).attr(['width', 'height']); var attrs = $(elem).attr(['width', 'height']);
var setsize = (!attrs.width || !attrs.height); var setsize = (!attrs.width || !attrs.height);
var cur_href = elem.getAttributeNS(xlinkns, "href"); var cur_href = getHref(elem);
// Do nothing if no URL change or size change // Do nothing if no URL change or size change
if(cur_href !== val) { if(cur_href !== val) {
@@ -9605,7 +9618,7 @@ this.setImageURL = function(val) {
var batchCmd = new BatchCommand("Change Image URL"); var batchCmd = new BatchCommand("Change Image URL");
elem.setAttributeNS(xlinkns, "xlink:href", val); setHref(elem, val);
batchCmd.addSubCommand(new ChangeElementCommand(elem, { batchCmd.addSubCommand(new ChangeElementCommand(elem, {
"#href": cur_href "#href": cur_href
})); }));
@@ -9906,7 +9919,7 @@ var changeSelectedAttributeNoUndo = function(attr, newValue, elems) {
// } // }
} else if (attr == "#href") { } else if (attr == "#href") {
elem.setAttributeNS(xlinkns, "xlink:href", newValue); setHref(elem, newValue);
} }
else elem.setAttribute(attr, newValue); else elem.setAttribute(attr, newValue);
if (i==0) if (i==0)
@@ -10525,7 +10538,7 @@ this.setBackground = function(color, url) {
'style':'pointer-events:none' 'style':'pointer-events:none'
}); });
} }
bg_img.setAttributeNS(xlinkns, "xlink:href", url); setHref(bg_img, 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);