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

Merge pull request #7 from ibrierley/master 

Fix for import svg image leading to unattached dragtool
master
Jeff Schiller 2016-01-31 23:27:01 -08:00
parent 7e5a012aa9 f1b67e4159
commit 6715e62146
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
editor/svg-editor.js
View File

@ -4906,12 +4906,14 @@ TODOS
if (file.type.indexOf('svg') != -1) {
reader = new FileReader();
reader.onloadend = function(e) {
svgCanvas.importSvgString(e.target.result, true);
var newElement = svgCanvas.importSvgString(e.target.result, true);
svgCanvas.ungroupSelectedElement();
svgCanvas.ungroupSelectedElement();
svgCanvas.groupSelectedElements();
svgCanvas.alignSelectedElements('m', 'page');
svgCanvas.alignSelectedElements('c', 'page');
// highlight imported element, otherwise we get strange empty selectbox
svgCanvas.selectOnly([newElement]);
$('#dialog_box').hide();
};
reader.readAsText(file);

7
editor/svgcanvas.js
View File

@ -4946,7 +4946,7 @@ this.setSvgString = function(xmlString) {
// xmlString - The SVG as XML text.
//
// Returns:
// This function returns false if the import was unsuccessful, true otherwise.
// This function returns null if the import was unsuccessful, or the element otherwise.
// TODO:
// * properly handle if namespace is introduced by imported content (must add to svgcontent
// and update all prefixes in the imported node)
@ -5067,10 +5067,11 @@ this.importSvgString = function(xmlString) {
} catch(e) {
console.log(e);
return false;
return null;
}
return true;
// we want to return the element so we can automatically select it
return use_el;
};
// TODO(codedread): Move all layer/context functions in draw.js