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

Fixed issue 715: Load via ?url= no longer working

Browse Source 
git-svn-id: http://svg-edit.googlecode.com/svn/trunk@1791 eee81c28-f429-11dd-99c0-75d572ba1ddd
This commit is contained in:
Alexis Deveria
2010-10-11 12:21:37 +00:00
parent ddbbd53bf6
commit 2696644a19
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
editor/svg-editor.js
View File

@@ -211,7 +211,7 @@
var qstr = $.param.querystring(); var qstr = $.param.querystring();
if(!src) { // urldata.source may have been null if it ended with '=' if(!src) { // urldata.source may have been null if it ended with '='
if(qstr.indexOf('source=data:' >= 0)) { if(qstr.indexOf('source=data:') >= 0) {
src = qstr.match(/source=(data:[^&]*)/)[1]; src = qstr.match(/source=(data:[^&]*)/)[1];
} }
} }
@@ -4440,6 +4440,8 @@
}; };
Editor.loadFromURL = function(url, opts) { Editor.loadFromURL = function(url, opts) {
if(!opts) opts = {};
var cache = opts.cache; var cache = opts.cache;
var cb = opts.callback; var cb = opts.callback;

6
editor/svgcanvas.js
View File

@@ -1856,11 +1856,11 @@ var assignAttributes = this.assignAttributes = function(node, attrs, suspendLeng
if(!suspendLength) suspendLength = 0; if(!suspendLength) suspendLength = 0;
// Opera has a problem with suspendRedraw() apparently // Opera has a problem with suspendRedraw() apparently
var handle = null; var handle = null;
if (!window.opera) svgroot.suspendRedraw(suspendLength); if (!isOpera) svgroot.suspendRedraw(suspendLength);
for (var i in attrs) { for (var i in attrs) {
var ns = (i.substr(0,4) == "xml:" ? xmlns : var ns = (i.substr(0,4) === "xml:" ? xmlns :
i.substr(0,6) == "xlink:" ? xlinkns : null); i.substr(0,6) === "xlink:" ? xlinkns : null);
if(ns || !unitCheck) { if(ns || !unitCheck) {
node.setAttributeNS(ns, i, attrs[i]); node.setAttributeNS(ns, i, attrs[i]);