scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-06 04:42:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

SvgImport: Implement support for onLoad and onError callbacks on string input.

Browse source 
Closes #827
This commit is contained in:
Jürg Lehni 2016-02-14 15:12:52 +01:00
parent 2025bd1a77
commit 75c40babc9
1 changed files with 26 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/svg/SvgImport.js
View file

@ -640,22 +640,32 @@ new function() {
return null; return null;
options = typeof options === 'function' ? { onLoad: options } options = typeof options === 'function' ? { onLoad: options }
: options || {}; : options || {};
var node = source,
// Remember current scope so we can restore it in onLoad. // Remember current scope so we can restore it in onLoad.
scope = paper; var scope = paper,
item = null;
function onLoad(svg) { function onLoad(svg) {
try {
var node = typeof svg === 'object' ? svg : new window.DOMParser()
.parseFromString(svg, 'image/svg+xml');
if (!node.nodeName) {
node = null;
throw new Error('Unsupported SVG source: ' + source);
}
paper = scope; paper = scope;
var item = importSVG(svg, options, true), item = importNode(node, options, true);
onLoad = options.onLoad; var onLoad = options.onLoad;
if (onLoad) if (onLoad)
onLoad.call(this, item, svg); onLoad(item, svg);
} catch (e) {
onError(e);
}
} }
function onError(message, status) { function onError(message, status) {
var onError = options.onError; var onError = options.onError;
if (onError) { if (onError) {
onError.call(this, message, status); onError(message, status);
} else { } else {
throw new Error(message); throw new Error(message);
} }
@ -667,15 +677,16 @@ new function() {
if (typeof source === 'string' && !/^.*</.test(source)) { if (typeof source === 'string' && !/^.*</.test(source)) {
// First see if we're meant to import an element with the given // First see if we're meant to import an element with the given
// id. // id.
node = document.getElementById(source); var node = document.getElementById(source);
// Check if the string does not represent SVG data, in which // Check if the string does not represent SVG data, in which
// case it must be the URL of a SVG to be loaded. // case it must be the URL of a SVG to be loaded.
if (node) { if (node) {
source = null; onLoad(node);
} else { } else {
Http.request({ Http.request({
url: source, async: true, url: source, async: true,
onLoad: onLoad, onError: onError onLoad: onLoad,
onError: onError
}); });
} }
} else if (typeof File !== 'undefined' && source instanceof File) { } else if (typeof File !== 'undefined' && source instanceof File) {
@ -688,15 +699,11 @@ new function() {
onError(reader.error); onError(reader.error);
}; };
return reader.readAsText(source); return reader.readAsText(source);
} else {
onLoad(source);
} }
if (typeof source === 'string') { return item;
node = new window.DOMParser().parseFromString(source,
'image/svg+xml');
}
if (!node.nodeName)
throw new Error('Unsupported SVG source: ' + source);
return importNode(node, options, true);
} }
// NOTE: Documentation is in Item#importSVG() // NOTE: Documentation is in Item#importSVG()