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

Allow #importSVG() to import from File objects too.

Browse source
This commit is contained in:
Jürg Lehni 2013-11-03 12:10:19 +01:00
parent 5e4bcbb5e5
commit 1637a31ad7
1 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/svg/SVGImport.js
View file

@ -490,29 +490,48 @@ new function() {
return match && definitions[match[1]]; return match && definitions[match[1]];
} }
function importSVG(node, isRoot, options) { function importSVG(source, isRoot, options) {
if (!options) if (!source)
return null;
if (!options) {
options = {}; options = {};
if (typeof node === 'string') { } else if (typeof options === 'function') {
// Check if the string does not represent SVG data, in which case options = { onLoad: options };
// it must be a url of a SVG to be loaded.
if (isRoot && node && !/^.*</.test(node)) {
if (typeof options === 'function')
options = { onLoad: options };
// Remember current scope so we can restore it in the callback.
var scope = paper;
return Http.request('get', node, function(svg) {
paper = scope;
var item = importSVG(svg, isRoot, options),
onLoad = options.onLoad,
view = scope.project && scope.project.view;
if (onLoad)
onLoad.call(this, item);
view.draw(true);
});
}
node = new DOMParser().parseFromString(node, 'image/svg+xml');
} }
var node = source,
// Remember current scope so we can restore it in onLoad.
scope = paper;
function onLoadCallback(svg) {
paper = scope;
var item = importSVG(svg, isRoot, options),
onLoad = options.onLoad,
view = scope.project && scope.project.view;
if (onLoad)
onLoad.call(this, item);
view.draw(true);
}
if (isRoot) {
if (typeof source === 'string' && !/^.*</.test(source)) {
// Check if the string does not represent SVG data, in which case
// it must be a url of a SVG to be loaded.
return Http.request('get', source, onLoadCallback);
} else if (typeof File !== 'undefined' && source instanceof File) {
// Load local file through FileReader
var reader = new FileReader();
reader.onload = function() {
onLoadCallback(reader.result);
};
return reader.readAsText(source);
}
}
if (typeof source === 'string')
node = new DOMParser().parseFromString(source, 'image/svg+xml');
if (!node.nodeName)
throw new Error('Unsupported SVG source: ' + source);
// jsdom in Node.js uses uppercase values for nodeName... // jsdom in Node.js uses uppercase values for nodeName...
var type = node.nodeName.toLowerCase(), var type = node.nodeName.toLowerCase(),
importer = importers[type], importer = importers[type],