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

Merge github.com:msand/paper.js into msand-master

Browse source
This commit is contained in:
Jürg Lehni 2013-11-26 23:38:40 +01:00
commit f224bb3e86
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/PaperScope.js
View file

@ -219,7 +219,7 @@ var PaperScope = Base.extend(/** @lends PaperScope# */{
function handleAttribute(name) { function handleAttribute(name) {
name += 'Attribute'; name += 'Attribute';
return function(el, attr) { return function(el, attr) {
return el[name](attr) || el[name]('data-paper-' + attr); return el[name] && (el[name](attr) || el[name]('data-paper-' + attr));
}; };
} }

4
src/core/PaperScript.js
View file

@ -315,9 +315,9 @@ paper.PaperScope.prototype.PaperScript = (function(root) {
if (src) { if (src) {
// If we're loading from a source, request that first and // If we're loading from a source, request that first and
// then run later. // then run later.
paper.Http.request('get', src, function(code) { paper.Http.request('get', src, function(scope, code) {
evaluate(code, scope); evaluate(code, scope);
}); }.bind(this, scope));
} else { } else {
// We can simply get the code form the script tag. // We can simply get the code form the script tag.
evaluate(script.innerHTML, scope); evaluate(script.innerHTML, scope);