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

Fixed bug where imported images could be imported wrong; fixed bug where parent group could be removed from source edit 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1888 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-12-20 15:19:18 +00:00
parent 3622c3d92b
commit f5754a4c6f
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
editor/svgcanvas.js
View File

@ -6816,7 +6816,16 @@ this.importSvgString = function(xmlString) {
// Get unique ID // Get unique ID
var uid = svgedit.utilities.encode64(xmlString.length + xmlString).substr(0,32); var uid = svgedit.utilities.encode64(xmlString.length + xmlString).substr(0,32);
var useExisting = false;
// Look for symbol and make sure symbol exists in image
if(import_ids[uid]) { if(import_ids[uid]) {
if( $(import_ids[uid].symbol).parents('#svgroot').length ) {
useExisting = true;
}
}
if(useExisting) {
var symbol = import_ids[uid].symbol; var symbol = import_ids[uid].symbol;
var ts = import_ids[uid].xform; var ts = import_ids[uid].xform;
} else { } else {
@ -6923,11 +6932,13 @@ var identifyLayers = canvas.identifyLayers = function() {
var numchildren = svgcontent.childNodes.length; var numchildren = svgcontent.childNodes.length;
// loop through all children of svgcontent // loop through all children of svgcontent
var orphans = [], layernames = []; var orphans = [], layernames = [];
var childgroups = false;
for (var i = 0; i < numchildren; ++i) { for (var i = 0; i < numchildren; ++i) {
var child = svgcontent.childNodes.item(i); var child = svgcontent.childNodes.item(i);
// for each g, find its layer name // for each g, find its layer name
if (child && child.nodeType == 1) { if (child && child.nodeType == 1) {
if (child.tagName == "g") { if (child.tagName == "g") {
childgroups = true;
var name = $("title",child).text(); var name = $("title",child).text();
// Hack for Opera 10.60 // Hack for Opera 10.60
@ -6955,8 +6966,9 @@ var identifyLayers = canvas.identifyLayers = function() {
} }
} }
} }
// create a new layer and add all the orphans to it // create a new layer and add all the orphans to it
if (orphans.length > 0) { if (orphans.length > 0 || !childgroups) {
var i = 1; var i = 1;
while (layernames.indexOf(("Layer " + i)) >= 0) { i++; } while (layernames.indexOf(("Layer " + i)) >= 0) { i++; }
var newname = "Layer " + i; var newname = "Layer " + i;
@ -7856,8 +7868,13 @@ var findDefs = function() {
defs = defs[0]; defs = defs[0];
} }
else { else {
defs = svgdoc.createElementNS(svgns, "defs" );
if(svgcontent.firstChild) {
// first child is a comment, so call nextSibling // first child is a comment, so call nextSibling
defs = svgcontent.insertBefore( svgdoc.createElementNS(svgns, "defs" ), svgcontent.firstChild.nextSibling); svgcontent.insertBefore( defs, svgcontent.firstChild.nextSibling);
} else {
svgcontent.appendChild(defs);
}
} }
return defs; return defs;
}; };