Skip to content

Commit 4e8fe53

Browse files
Kevin Ellisbirtles
authored andcommitted
Move mutable timeline back to web-animations-1
1 parent 9d63f39 commit 4e8fe53

File tree

2 files changed

+9
-24
lines changed

2 files changed

+9
-24
lines changed

web-animations-1/Overview.bs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -703,7 +703,7 @@ frame</a>.
703703

704704
### Timeline Phase ### {#timeline-phases}
705705

706-
A [=timeline=] may be in one of four possible
706+
A [=timeline=] may be in one of four possible
707707
<dfn export lt="timeline phase">phases</dfn>:
708708

709709
1. <dfn export lt="timeline inactive phase">inactive</dfn>
@@ -755,7 +755,7 @@ time=]. If |timeline| is inactive, return an [=unresolved=] [=time value=].
755755

756756
### The default document timeline ### {#the-documents-default-timeline}
757757

758-
Each {{Document}} has a <a>document timeline</a> called the
758+
Each {{Document}} has a <a>document timeline</a> called the
759759
<dfn export>default document timeline</dfn>.
760760
The <a>default document timeline</a> is unique to each document and persists for
761761
the lifetime of the document including calls to <a>document.open()</a> [[!HTML]].
@@ -1184,7 +1184,7 @@ as CSS Animations [[CSS-ANIMATIONS-1]].
11841184
</div>
11851185

11861186
1. If |seek time| is <a lt=unresolved>resolved</a>,
1187-
1187+
11881188
<div class="switch">
11891189

11901190
: If |has finite timeline| is true,
@@ -1684,7 +1684,7 @@ animation.finish(); // finish event is queued immediately and finished promise
16841684
animation.currentTime = 0;
16851685
</pre></div>
16861686

1687-
Note that like the procedure to <a>finish an animation</a>,
1687+
Note that like the procedure to <a>finish an animation</a>,
16881688
the procedure to <a>cancel an animation</a> similarly queues the
16891689
<a>cancel event</a> and rejects the <a>current finished promise</a> and
16901690
<a>current ready promise</a> in a <em>synchronous</em> manner.
@@ -1966,7 +1966,7 @@ The procedure to <dfn>reverse an animation</dfn> of <a>animation</a>
19661966
### Play states ### {#play-states}
19671967

19681968
An <a>animation</a> may be described as being in one of the following
1969-
<dfn lt="play state">play states</dfn> for each of which, a
1969+
<dfn lt="play state">play states</dfn> for each of which, a
19701970
non-normative description is also provided:
19711971

19721972
<div class=informative-bg>
@@ -4103,7 +4103,7 @@ interface Animation : EventTarget {
41034103
optional AnimationTimeline? timeline);
41044104
attribute DOMString id;
41054105
attribute AnimationEffect? effect;
4106-
readonly attribute AnimationTimeline? timeline;
4106+
attribute AnimationTimeline? timeline;
41074107
attribute double? startTime;
41084108
attribute double? currentTime;
41094109
attribute double playbackRate;
@@ -4173,6 +4173,8 @@ interface Animation : EventTarget {
41734173
the procedure to <a>set the associated effect of an animation</a>.
41744174
: <dfn attribute for=Animation>timeline</dfn>
41754175
:: The <a>timeline</a> associated with this animation.
4176+
Setting this attribute updates the object's <a>timeline</a> using
4177+
the procedure to <a>set the timeline of an animation</a>.
41764178
: <dfn attribute for=Animation>startTime</dfn>
41774179
:: Returns the [=start time=] of this animation.
41784180
Setting this attribute updates the [=start time=] using

web-animations-2/Overview.bs

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ After the step to assign <var>new effect</var> as <var>animation</var>'s
175175
> This is not quite right. If <var>old effect</var> is attached to another
176176
> animation in the same task then we should probably not do an extra
177177
> callback with <a>unresolved</a>.
178-
>
178+
>
179179
> The definition of when <a>custom effects</a> gets called needs to be
180180
> audited and probably rewritten.
181181
> </div>
@@ -1515,23 +1515,6 @@ partial interface AnimationTimeline {
15151515

15161516
</div>
15171517

1518-
<h3 id="the-animation-interface">The <code>Animation</code> interface</h3>
1519-
1520-
The <a>Animation</a> interface is amended to make the <var>timeline</var> member mutable:
1521-
1522-
<pre class='idl'>
1523-
partial interface Animation {
1524-
attribute AnimationTimeline? timeline;
1525-
};
1526-
</pre>
1527-
1528-
<div class='attributes'>
1529-
1530-
: <dfn attribute for=Animation>timeline</dfn>
1531-
:: The <a>timeline</a> associated with this animation.
1532-
Setting this attribute updates the object's <a>timeline</a> using
1533-
the procedure to <a>set the timeline of an animation</a>.
1534-
15351518
<h3 id="the-animationeffect-interface">The <code>AnimationEffect</code> interface</h3>
15361519

15371520
<pre class='idl'>

0 commit comments

Comments
 (0)