Skip to content

Commit 29338ce

Browse files
committed
Merge remote-tracking branch 'origin/master' into HEAD
2 parents 6ed4038 + e09edbf commit 29338ce

File tree

2 files changed

+51
-12
lines changed

2 files changed

+51
-12
lines changed

History.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
### 2.1.2 - *July 8 2015*
2+
* Fix a bug where onfinish was being called for GroupEffects before they were finished.
3+
14
### 2.1.1 - *July 1 2015*
25
* Add Animation.timeline getter
36
* Add AnimationEffect.parent getter

src/timing-utilities.js

Lines changed: 48 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,20 +55,56 @@
5555
get playbackRate() {
5656
return this._playbackRate;
5757
},
58+
set delay(value) {
59+
this._setMember('delay', value);
60+
},
61+
get delay() {
62+
return this._delay;
63+
},
64+
set endDelay(value) {
65+
this._setMember('endDelay', value);
66+
},
67+
get endDelay() {
68+
return this._endDelay;
69+
},
70+
set fill(value) {
71+
this._setMember('fill', value);
72+
},
73+
get fill() {
74+
return this._fill;
75+
},
76+
set iterationStart(value) {
77+
this._setMember('iterationStart', value);
78+
},
79+
get iterationStart() {
80+
return this._iterationStart;
81+
},
82+
set duration(value) {
83+
this._setMember('duration', value);
84+
},
85+
get duration() {
86+
return this._duration;
87+
},
88+
set direction(value) {
89+
this._setMember('direction', value);
90+
},
91+
get direction() {
92+
return this._direction;
93+
},
94+
set easing(value) {
95+
this._setMember('easing', value);
96+
},
97+
get easing() {
98+
return this._easing;
99+
},
100+
set iterations(value) {
101+
this._setMember('iterations', value);
102+
},
103+
get iterations() {
104+
return this._iterations;
105+
}
58106
};
59107

60-
var members = ['delay', 'endDelay', 'fill', 'iterationStart',
61-
'duration', 'direction', 'easing', 'iterations'];
62-
members.forEach(function(name) {
63-
Object.defineProperty(
64-
AnimationEffectTiming.prototype,
65-
name,
66-
{
67-
get: function() { return this['_' + name]; },
68-
set: function(value) { this._setMember(name, value); }
69-
});
70-
});
71-
72108
function makeTiming(timingInput, forGroup, effect) {
73109
var timing = new AnimationEffectTiming();
74110
if (forGroup) {

0 commit comments

Comments
 (0)