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

Fixed bug caused when serializing in Webkit 

git-svn-id: http://svg-edit.googlecode.com/svn/trunk@982 eee81c28-f429-11dd-99c0-75d572ba1ddd
master
Alexis Deveria 2009-11-30 21:08:09 +00:00
parent d5f867f0a8
commit 32c6096791
2 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/svg-editor.css
View File

@ -296,10 +296,6 @@ body {
display: none;
}
#svg_editor #selected_panel .selected_tool {
vertical-align: 12px;
}
#svg_editor #multiselected_panel .selected_tool {
vertical-align: 12px;
}

19
editor/svgcanvas.js
View File

@ -1070,14 +1070,10 @@ function BatchCommand(text) {
});
svgcontent.removeAttribute('id');
var res = canvas.getResolution();
assignAttributes(svgcontent, {width: res.w, height: res.h});
assignAttributes(svgcontent, {width: res.w, height: res.h});
svgcontent.removeAttribute('viewBox');
var output = svgToString(svgcontent, 0);
assignAttributes(svgcontent, {id: 'svgcontent', 'viewBox':[0,0,res.w,res.h].join(' ')});
svgcontent.removeAttribute('width');
svgcontent.removeAttribute('height');
return output;
}
@ -1094,6 +1090,7 @@ function BatchCommand(text) {
for (i=attrs.length-1; i>=0; i--) {
attr = attrs.item(i);
var attrVal = attr.nodeValue;
if (attrVal != "") {
if(attrVal.indexOf('pointer-events') == 0) continue;
out.push(" ");
@ -1111,6 +1108,7 @@ function BatchCommand(text) {
var img = encodableImages[attrVal];
if(img) attrVal = img;
}
// map various namespaces to our fixed namespace prefixes
// TODO: put this into a map and do a look-up instead of if-else
if (attr.namespaceURI == xlinkns) {
@ -4025,7 +4023,6 @@ function BatchCommand(text) {
try {
// convert string into XML document
var newDoc = Utils.text2xml(xmlString);
// run it through our sanitizer to remove anything we do not support
sanitizeSvg(newDoc.documentElement);
@ -4037,7 +4034,6 @@ function BatchCommand(text) {
// set new svg document
svgcontent = svgroot.appendChild(svgdoc.importNode(newDoc.documentElement, true));
// change image href vals if possible
$(svgcontent).find('image').each(function() {
var image = this;
@ -4075,11 +4071,12 @@ function BatchCommand(text) {
h = svgcontent.getAttribute("height");
svgcontent.setAttribute("viewBox", ["0", "0", w, h].join(" "));
}
// just to be safe, remove any width/height from text so that they are 100%/100%
svgcontent.removeAttribute('width');
svgcontent.removeAttribute('height');
// just to be safe, set width and height to 100%/100%
// (removing causes bug in Webkit)
svgcontent.setAttribute('width','100%');
svgcontent.setAttribute('height','100%');
batchCmd.addSubCommand(new InsertElementCommand(svgcontent));
// update root to the correct size
var changes = {};
changes['width'] = svgroot.getAttribute('width');