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

Fixed import bug for Webkit browsers 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1651 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2010-07-29 17:49:28 +00:00
parent e79a15f22a
commit bcbb43ec91
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
editor/svgcanvas.js
View File

@ -4545,12 +4545,13 @@ var getMouseTarget = this.getMouseTarget = function(evt) {
// to be a translate // to be a translate
var xform = svgroot.createSVGTransform(); var xform = svgroot.createSVGTransform();
var tlist = getTransformList(selected); var tlist = getTransformList(selected);
// Note that if Webkit and there's no ID for this
// element, the dummy transform may have gotten lost.
// This results in unexpected behaviour
xform.setTranslate(dx,dy); xform.setTranslate(dx,dy);
if(tlist.numberOfItems) { if(tlist.numberOfItems) {
tlist.replaceItem(xform, 0); tlist.replaceItem(xform, 0);
// TODO: Webkit returns null here, find out why
// console.log(selected.getAttribute("transform"))
} else { } else {
tlist.appendItem(xform); tlist.appendItem(xform);
} }
@ -7899,7 +7900,7 @@ var convertToGroup = this.convertToGroup = function(elem) {
var has_more = $(svgcontent).find('use:data(symbol)').length; var has_more = $(svgcontent).find('use:data(symbol)').length;
var g = svgdoc.createElementNS(svgns, "g"); var g = svgdoc.createElementNS(svgns, "g");
var childs = elem.children; var childs = elem.childNodes;
for(var i = 0; i < childs.length; i++) { for(var i = 0; i < childs.length; i++) {
g.appendChild(childs[i].cloneNode(true)); g.appendChild(childs[i].cloneNode(true));
@ -8002,7 +8003,7 @@ this.setSvgString = function(xmlString) {
// Check if it already has a gsvg group // Check if it already has a gsvg group
var pa = this.parentNode; var pa = this.parentNode;
if(pa.children.length === 1 && pa.nodeName === 'g') { if(pa.childNodes.length === 1 && pa.nodeName === 'g') {
$(pa).data('gsvg', this); $(pa).data('gsvg', this);
pa.id = pa.id || getNextId(); pa.id = pa.id || getNextId();
} else { } else {
@ -8207,10 +8208,12 @@ this.importSvgString = function(xmlString) {
symbol.id = getNextId(); symbol.id = getNextId();
var use_el = svgdoc.createElementNS(svgns, "use"); var use_el = svgdoc.createElementNS(svgns, "use");
use_el.id = getNextId();
use_el.setAttributeNS(xlinkns, "xlink:href", "#" + symbol.id); use_el.setAttributeNS(xlinkns, "xlink:href", "#" + symbol.id);
findDefs().appendChild(symbol); findDefs().appendChild(symbol);
current_layer.appendChild(use_el); current_layer.appendChild(use_el);
clearSelection(); clearSelection();
use_el.setAttribute("transform", ts); use_el.setAttribute("transform", ts);
recalculateDimensions(use_el); recalculateDimensions(use_el);
$(use_el).data('symbol', symbol); $(use_el).data('symbol', symbol);
@ -10039,6 +10042,7 @@ this.ungroupSelectedElement = function() {
var g = selectedElements[0]; var g = selectedElements[0];
if($(g).data('gsvg') || $(g).data('symbol')) { if($(g).data('gsvg') || $(g).data('symbol')) {
// Is svg, so actually convert to group // Is svg, so actually convert to group
convertToGroup(g); convertToGroup(g);
return; return;
} }