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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Jürg Lehni 2011-07-27 22:04:57 +01:00
commit 3f76d1ffe6
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/browser/DomEvent.js
View file

@ -84,7 +84,7 @@ var DomEvent = {
stop: function(event) { stop: function(event) {
DomEvent.stopPropagation(event); DomEvent.stopPropagation(event);
DomEvent.preventDefault(event); DomEvent.preventDefault(event);
}, }
}; };
DomEvent.requestAnimationFrame = new function() { DomEvent.requestAnimationFrame = new function() {

22
src/path/CompoundPath.js
View file

@ -49,17 +49,17 @@ var CompoundPath = this.CompoundPath = PathItem.extend(/** @lends CompoundPath#
// we potentially use as array, depending on what is passed. // we potentially use as array, depending on what is passed.
var items = !paths || !Array.isArray(paths) var items = !paths || !Array.isArray(paths)
|| typeof paths[0] !== 'object' ? arguments : paths; || typeof paths[0] !== 'object' ? arguments : paths;
for (var i = 0, l = items.length; i < l; i++) { this.addChildren(items);
var path = items[i]; },
// All paths except for the top one (last one in list) are set to
// clockwise orientation when creating a compound path, so that they insertChild: function(index, item) {
// appear as holes, but only if their orientation was not already this.base(index, item);
// specified before (= _clockwise is defined). // All children except for the bottom one (first one in list) are set
// TODO: Should this be handled in appendTop / Bottom instead? // to anti-clockwise orientation, so that they appear as holes, but
if (path._clockwise === undefined) // only if their orientation was not already specified before
path.setClockwise(i < l - 1); // (= _clockwise is defined).
this.addChild(path); if (item._clockwise === undefined)
} item.setClockwise(item._index == 0);
}, },
/** /**