Skip to content

Commit 23f7836

Browse files
author
Andrew Start
committed
Improved the Container ticking. Built library.
1 parent 3262cab commit 23f7836

8 files changed

Lines changed: 19 additions & 14 deletions

File tree

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,4 +123,5 @@ Represents a point on a 2 dimensional x / y coordinate system.
123123
* ColorFilter now attempts to account for browsers that don't handle pixel manipulation properly.
124124
* Rectangle.contains() allows for a Point or Rectangle to be passed for the first parameter.
125125
* Touch no longer breaks when Touch.disable() is called on a stage that did not have touch in the first place.
126-
* Containers that are not tickEnabled still pass ticks on to their children if tickChildren is true.
126+
* Containers that are not tickEnabled still pass ticks on to their children if tickChildren is true.
127+
* Changed how MovieClips fetch the framerate from parents to properly set the new _duration as well.

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "EaselJS",
3-
"version": "0.8.2",
3+
"version": "0.8.3",
44
"homepage": "https://github.com/CreateJS/EaselJS",
55
"authors": [
66
"gskinner",

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "EaselJS",
3-
"version": "0.8.2",
3+
"version": "0.8.3",
44
"description": "EaselJS Docs",
55
"url": "http://www.createjs.com/#!/EaselJS",
66
"logo": "assets/docs-icon-EaselJS.png",

lib/easeljs.combined.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8014,7 +8014,11 @@ this.createjs = this.createjs||{};
80148014
if (this.tickChildren) {
80158015
for (var i=this.children.length-1; i>=0; i--) {
80168016
var child = this.children[i];
8017-
if ((child.tickEnabled || child.tickChildren) && child._tick) { child._tick(evtObj); }
8017+
if (child.tickEnabled && child._tick) { child._tick(evtObj); }
8018+
else if(child.tickChildren && child.Container__tick)
8019+
{
8020+
child.Container__tick(evtObj);
8021+
}
80188022
}
80198023
}
80208024
this.DisplayObject__tick(evtObj);
@@ -13113,14 +13117,14 @@ this.createjs = this.createjs || {};
1311313117
* @type String
1311413118
* @static
1311513119
**/
13116-
s.version = /*=version*/"0.8.2"; // injected by build process
13120+
s.version = /*=version*/"0.8.3"; // injected by build process
1311713121

1311813122
/**
1311913123
* The build date for this release in UTC format.
1312013124
* @property buildDate
1312113125
* @type String
1312213126
* @static
1312313127
**/
13124-
s.buildDate = /*=date*/"Thu, 05 Mar 2015 21:30:57 GMT"; // injected by build process
13128+
s.buildDate = /*=date*/"Fri, 06 Mar 2015 20:57:25 GMT"; // injected by build process
1312513129

1312613130
})();

lib/easeljs.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/movieclip.combined.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,11 +482,11 @@ this.createjs = this.createjs||{};
482482

483483
if(!this._framerate)
484484
{
485-
var o=this, fps = o.framerate;
485+
var o=this, fps = o._framerate;
486486
while ((o = o.parent) && fps == null) {
487487
if (o.mode == independent) { fps = o._framerate; }
488488
}
489-
this._framerate = fps;
489+
this.framerate = fps;
490490
}
491491

492492
//SpringRoll replacement, using an elapsed time from the beginning of the timeline
@@ -774,7 +774,7 @@ this.createjs = this.createjs || {};
774774
* @type String
775775
* @static
776776
**/
777-
s.version = /*=version*/"0.8.2"; // injected by build process
777+
s.version = /*=version*/"0.8.3"; // injected by build process
778778

779779
/**
780780
* The build date for this release in UTC format.
@@ -783,6 +783,6 @@ this.createjs = this.createjs || {};
783783
* @type String
784784
* @static
785785
**/
786-
s.buildDate = /*=date*/"Thu, 05 Mar 2015 21:30:57 GMT"; // injected by build process
786+
s.buildDate = /*=date*/"Fri, 06 Mar 2015 20:57:25 GMT"; // injected by build process
787787

788788
})();

lib/movieclip.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/easeljs/display/Container.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -559,7 +559,7 @@ this.createjs = this.createjs||{};
559559
for (var i=this.children.length-1; i>=0; i--) {
560560
var child = this.children[i];
561561
if (child.tickEnabled && child._tick) { child._tick(evtObj); }
562-
else if(child.tickChildren && child.children)
562+
else if(child.tickChildren && child.Container__tick)
563563
{
564564
child.Container__tick(evtObj);
565565
}

0 commit comments

Comments
 (0)