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

Stopped rounding of circles, added fix for importing SVG on Opera/Win/Non-EN 

git-svn-id: http://svg-edit.googlecode.com/svn/branches/transformlist@903 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-11-03 21:16:36 +00:00
parent ea2d803c18
commit b0d565bdeb
1 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
editor/svgcanvas.js
View File

@ -1145,6 +1145,29 @@ function BatchCommand(text) {
return out.join(''); return out.join('');
}; // end svgToString() }; // end svgToString()
// importNode, like cloneNode, causes the comma-to-period
// issue in Opera/Win/non-en. Thankfully we can compare to the original XML
// and simply use the original value when necessary
var fixOperaXML = function(elem, orig_el) {
var x_attrs = elem.attributes;
$.each(x_attrs, function(i, attr) {
if(attr.nodeValue.indexOf(',') == -1) return;
// attr val has comma, so let's get the good value
var ns = attr.nodeName == 'href' ? xlinkns :
attr.prefix == "xml" ? xmlns : null;
var good_attrval = orig_el.getAttribute(attr.nodeName);
elem.setAttributeNS(ns, attr.nodeName, good_attrval);
});
var childs = elem.childNodes;
var o_childs = orig_el.childNodes;
$.each(childs, function(i, child) {
if(child.nodeType == 1) {
fixOperaXML(child, o_childs[i]);
}
});
}
var recalculateAllSelectedDimensions = function() { var recalculateAllSelectedDimensions = function() {
var text = (current_resize_mode == "none" ? "position" : "size"); var text = (current_resize_mode == "none" ? "position" : "size");
var batchCmd = new BatchCommand(text); var batchCmd = new BatchCommand(text);
@ -1413,7 +1436,7 @@ function BatchCommand(text) {
changes["cx"] = c.x; changes["cx"] = c.x;
changes["cy"] = c.y; changes["cy"] = c.y;
// take the minimum of the new selected box's dimensions for the new circle radius // take the minimum of the new selected box's dimensions for the new circle radius
changes["r"] = round(Math.min(box.width/2,box.height/2)); changes["r"] = Math.min(box.width/2,box.height/2);
break; break;
case "ellipse": case "ellipse":
var c = remap(changes["cx"],changes["cy"]); var c = remap(changes["cx"],changes["cy"]);
@ -1884,7 +1907,7 @@ function BatchCommand(text) {
'cy': pt.y, 'cy': pt.y,
// take the minimum of the new selected box's dimensions for the new circle radius // take the minimum of the new selected box's dimensions for the new circle radius
'r': round(Math.min(selectedBBox.width/2,selectedBBox.height/2)) 'r': Math.min(selectedBBox.width/2,selectedBBox.height/2)
}, 1000); }, 1000);
break; break;
case "ellipse": case "ellipse":
@ -3875,6 +3898,12 @@ function BatchCommand(text) {
// set new svg document // set new svg document
svgcontent = svgroot.appendChild(svgdoc.importNode(newDoc.documentElement, true)); svgcontent = svgroot.appendChild(svgdoc.importNode(newDoc.documentElement, true));
// Fix XML for Opera/Win/Non-EN
if(window.opera) {
fixOperaXML(svgcontent, newDoc.documentElement);
}
svgcontent.setAttribute('id', 'svgcontent'); svgcontent.setAttribute('id', 'svgcontent');
// determine proper size // determine proper size
var w, h; var w, h;