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

SVG: Pass the imported SVG date as the 2nd parameter to onLoad()

Browse source
This commit is contained in:
Jürg Lehni 2016-02-01 20:09:43 +01:00
parent b2f3b587ec
commit ad21b2b07a
3 changed files with 22 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/item/Item.js
View file

@ -2121,9 +2121,10 @@ new function() { // // Scope to inject various item event handlers
* *
* @option [options.expandShapes=false] {Boolean} whether imported shape * @option [options.expandShapes=false] {Boolean} whether imported shape
* items should be expanded to path items * items should be expanded to path items
* @option [options.onLoad] {Function} the callback function to call once * @option options.onLoad {Function} the callback function to call once the
* the SVG content is loaded from the given URL. Only required when * SVG content is loaded from the given URL receiving two arguments: the
* loading from external files. * converted `item` and the original `svg` data as a string. Only
* required when loading from external files.
* @option [options.applyMatrix={@link PaperScope#settings}.applyMatrix] * @option [options.applyMatrix={@link PaperScope#settings}.applyMatrix]
* {Boolean} whether imported items should have their transformation * {Boolean} whether imported items should have their transformation
* matrices applied to their contents or not * matrices applied to their contents or not
@ -2145,7 +2146,9 @@ new function() { // // Scope to inject various item event handlers
* *
* @param {SVGElement|String} svg the URL of the SVG file to fetch. * @param {SVGElement|String} svg the URL of the SVG file to fetch.
* @param {Function} onLoad the callback function to call once the SVG * @param {Function} onLoad the callback function to call once the SVG
* content is loaded from the given URL. * content is loaded from the given URL receiving two arguments: the
* converted `item` and the original `svg` data as a string. Only
* required when loading from external files.
* @return {Item} the newly created Paper.js item containing the converted * @return {Item} the newly created Paper.js item containing the converted
* SVG content * SVG content
*/ */

25
src/item/Project.js
View file

@ -757,20 +757,21 @@ var Project = PaperScopeItem.extend(/** @lends Project# */{
* @function * @function
* *
* @option [options.expandShapes=false] {Boolean} whether imported shape * @option [options.expandShapes=false] {Boolean} whether imported shape
* items should be expanded to path items * items should be expanded to path items
* @option [options.onLoad] {Function} the callback function to call once * @option options.onLoad(item, svg) {Function} the callback function to
* the SVG content is loaded from the given URL. Only required when loading * call once the SVG content is loaded from the given URL receiving two
* from external files. * arguments: the converted `item` and the original `svg` data as a
* string. Only required when loading from external files.
* @option [options.applyMatrix={@link PaperScope#settings}.applyMatrix] * @option [options.applyMatrix={@link PaperScope#settings}.applyMatrix]
* {Boolean} whether imported items should have their transformation * {Boolean} whether imported items should have their transformation
* matrices applied to their contents or not * matrices applied to their contents or not
* *
* @param {SVGElement|String} svg the SVG content to import, either as a SVG * @param {SVGElement|String} svg the SVG content to import, either as a SVG
* DOM node, a string containing SVG content, or a string describing the URL * DOM node, a string containing SVG content, or a string describing the
* of the SVG file to fetch. * URL of the SVG file to fetch.
* @param {Object} [options] the import options * @param {Object} [options] the import options
* @return {Item} the newly created Paper.js item containing the converted * @return {Item} the newly created Paper.js item containing the converted
* SVG content * SVG content
*/ */
/** /**
* Imports the provided external SVG file, converts it into Paper.js items * Imports the provided external SVG file, converts it into Paper.js items
@ -783,9 +784,11 @@ var Project = PaperScopeItem.extend(/** @lends Project# */{
* *
* @param {SVGElement|String} svg the URL of the SVG file to fetch. * @param {SVGElement|String} svg the URL of the SVG file to fetch.
* @param {Function} onLoad the callback function to call once the SVG * @param {Function} onLoad the callback function to call once the SVG
* content is loaded from the given URL. * content is loaded from the given URL receiving two arguments: the
* converted `item` and the original `svg` data as a string. Only
* required when loading from external files.
* @return {Item} the newly created Paper.js item containing the converted * @return {Item} the newly created Paper.js item containing the converted
* SVG content * SVG content
*/ */
removeOn: function(type) { removeOn: function(type) {

2
src/svg/SvgImport.js
View file

@ -563,7 +563,7 @@ new function() {
onLoad = options.onLoad, onLoad = options.onLoad,
view = scope.project && scope.getView(); view = scope.project && scope.getView();
if (onLoad) if (onLoad)
onLoad.call(this, item); onLoad.call(this, item, svg);
} }
if (isRoot) { if (isRoot) {