Skip to content

Commit 20a3278

Browse files
committed
Merge pull request w3c#38 from shans/workingAgain
Update specification to match state of bikeshed at head
2 parents 615861d + 7fc25c5 commit 20a3278

File tree

1 file changed

+33
-37
lines changed

1 file changed

+33
-37
lines changed

Overview.src.html

Lines changed: 33 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4043,16 +4043,12 @@ <h5 id="applying-spacing-to-keyframes">Applying spacing to keyframes</h5>
40434043
[<var>paced A</var>, <var>k</var>].
40444044
2. Set the offset of <var>k</var> to
40454045
<a title="offsetk">offset</a><sub><var>paced
4046-
A</var></sub>
4047-
+
4046+
A</var></sub> +
40484047
(<a title="offsetk">offset</a><sub><var>paced
4049-
B</var></sub>
4050-
&minus;
4048+
B</var></sub> &minus;
40514049
<a title="offsetk">offset</a><sub><var>paced
4052-
A</var></sub>)
4053-
&times;
4054-
<a title="distk">dist</a><sub><var>k</var></sub>
4055-
/
4050+
A</var></sub>) &times;
4051+
<a title="distk">dist</a><sub><var>k</var></sub> /
40564052
<a title="distk">dist</a><sub><var>paced
40574053
B</var></sub>
40584054
7. For each keyframe in the range (<var>paced A</var>,
@@ -5483,7 +5479,7 @@ <h3 id="the-computedanimationtiming-interface">The
54835479

54845480
<div class='attributes'>
54855481

5486-
: <dfn attribute for=ComputedTimingProperties>startTime</dfn>
5482+
: <dfn dict-member for=ComputedTimingProperties>startTime</dfn>
54875483
<span member-info for=ComputedTimingProperties/startTime></span>
54885484
:: The <a title='animation node start time'>start time</a> of this
54895485
<a>animation node</a> in milliseconds.
@@ -5497,19 +5493,19 @@ <h3 id="the-computedanimationtiming-interface">The
54975493
the <a title="animation node start time">start time</a> and
54985494
<a>start delay</a>.
54995495

5500-
: <dfn attribute for=ComputedTimingProperties>endTime</dfn>
5496+
: <dfn dict-member for=ComputedTimingProperties>endTime</dfn>
55015497
<span member-info for=ComputedTimingProperties/endTime></span>
55025498
:: The <a>end time</a> of the <a>animation node</a> expressed in
55035499
milliseconds in <a title="inherited time">inherited time
55045500
space</a>.
55055501
This corresponds to the end of the <a>animation node</a>'s active
55065502
interval plus any <a>end delay</a>.
55075503

5508-
: <dfn attribute for=ComputedTimingProperties>activeDuration</dfn>
5504+
: <dfn dict-member for=ComputedTimingProperties>activeDuration</dfn>
55095505
<span member-info for=ComputedTimingProperties/activeDuration></span>
55105506
:: The <a>active duration</a> of this <a>animation node</a>.
55115507

5512-
: <dfn attribute for=ComputedTimingProperties>localTime</dfn>
5508+
: <dfn dict-member for=ComputedTimingProperties>localTime</dfn>
55135509
<span member-info for=ComputedTimingProperties/localTime></span>
55145510
:: The <a>local time</a> of this <a>animation node</a>.
55155511

@@ -5518,11 +5514,11 @@ <h3 id="the-computedanimationtiming-interface">The
55185514
it has a <a>parent animation group</a> that is not <a>in
55195515
effect</a>.
55205516

5521-
: <dfn attribute for=ComputedTimingProperties>timeFraction</dfn>
5517+
: <dfn dict-member for=ComputedTimingProperties>timeFraction</dfn>
55225518
<span member-info for=ComputedTimingProperties/timeFraction></span>
55235519
:: The current <a>time fraction</a> of this <a>animation node</a>.
55245520

5525-
: <dfn attribute for=ComputedTimingProperties>currentIteration</dfn>
5521+
: <dfn dict-member for=ComputedTimingProperties>currentIteration</dfn>
55265522
<span member-info for=ComputedTimingProperties/currentIteration></span>
55275523
:: The <a>current iteration</a> index beginning with zero for the first
55285524
iteration.
@@ -5558,62 +5554,62 @@ <h3 id="the-animationtiminginput-dictionary">The <code>AnimationTimingProperties
55585554

55595555
<div class='attributes'>
55605556

5561-
: <dfn attribute for=AnimationTimingProperties>delay</dfn>
5557+
: <dfn dict-member for=AnimationTimingProperties>delay</dfn>
55625558
<span member-info for=AnimationTimingProperties/delay></span>
55635559
:: The specified <a>start delay</a>.
55645560

55655561
See the description of the <code>delay</code> attribute on
55665562
the {{AnimationTiming}} interface.
55675563

5568-
: <dfn attribute for=AnimationTimingProperties>endDelay</dfn>
5564+
: <dfn dict-member for=AnimationTimingProperties>endDelay</dfn>
55695565
<span member-info for=AnimationTimingProperties/endDelay></span>
55705566
:: The specified <a>end delay</a>.
55715567

55725568
See the description of the <code>endDelay</code> attribute on
55735569
the {{AnimationTiming}} interface.
55745570

5575-
: <dfn attribute for=AnimationTimingProperties>fill</dfn>
5571+
: <dfn dict-member for=AnimationTimingProperties>fill</dfn>
55765572
<span member-info for=AnimationTimingProperties/fill></span>
55775573
:: The <a>fill mode</a> as specified by one of the <a enum>FillMode</a>
55785574
enumeration values.
55795575

5580-
: <dfn attribute for=AnimationTimingProperties>iterationStart</dfn>
5576+
: <dfn dict-member for=AnimationTimingProperties>iterationStart</dfn>
55815577
<span member-info for=AnimationTimingProperties/iterationStart></span>
55825578
:: The <a>animation node</a>'s <a>iteration start</a> property.
55835579

55845580
See the description of the <code>iterationStart</code> attribute
55855581
on the {{AnimationTiming}} interface.
55865582

5587-
: <dfn attribute for=AnimationTimingProperties>iterations</dfn>
5583+
: <dfn dict-member for=AnimationTimingProperties>iterations</dfn>
55885584
<span member-info for=AnimationTimingProperties/iterations></span>
55895585
:: The <a>animation node</a>'s <a>iteration count</a> property.
55905586

55915587
See the description of the <code>iterations</code> attribute
55925588
on the {{AnimationTiming}} interface.
55935589

5594-
: <dfn attribute for=AnimationTimingProperties>duration</dfn>
5590+
: <dfn dict-member for=AnimationTimingProperties>duration</dfn>
55955591
<span member-info for=AnimationTimingProperties/duration></span>
55965592
:: The <a>iteration duration</a> of the <a>animation node</a>.
55975593

55985594
See the description of the <code>duration</code>
55995595
attribute on the {{AnimationTiming}} interface.
56005596

5601-
: <dfn attribute for=AnimationTimingProperties>playbackRate</dfn>
5597+
: <dfn dict-member for=AnimationTimingProperties>playbackRate</dfn>
56025598
<span member-info for=AnimationTimingProperties/playbackRate></span>
56035599
:: The <a>animation node</a>'s <a
56045600
title="animation node playback rate">playback rate</a> property.
56055601

56065602
See the description of the <code>playbackRate</code> attribute
56075603
on the {{AnimationTiming}} interface.
56085604

5609-
: <dfn attribute for=AnimationTimingProperties>direction</dfn>
5605+
: <dfn dict-member for=AnimationTimingProperties>direction</dfn>
56105606
<span member-info for=AnimationTimingProperties/direction></span>
56115607
:: The <a>playback direction</a> of the <a>animation node</a>.
56125608

56135609
See the description of the <code>direction</code> attribute
56145610
on the {{AnimationTiming}} interface.
56155611

5616-
: <dfn attribute for=AnimationTimingProperties>easing</dfn>
5612+
: <dfn dict-member for=AnimationTimingProperties>easing</dfn>
56175613
<span member-info for=AnimationTimingProperties/easing></span>
56185614
:: The <a>timing function</a> used to scale the time to produce
56195615
easing effects.
@@ -6606,25 +6602,25 @@ <h4 id="the-keyframeeffectoptions-dictionary">The <code>KeyframeEffectOptions</c
66066602

66076603
<div class="attributes">
66086604

6609-
: <dfn attribute for=KeyframeEffectOptions>name</dfn>
6605+
: <dfn dict-member for=KeyframeEffectOptions>name</dfn>
66106606
<span member-info for=KeyframeEffectOptions/name></span>
66116607
:: The value to set for the {{AnimationEffect}}'s {{AnimationEffect/name}}
66126608
property.
66136609

6614-
: <dfn attribute for=KeyframeEffectOptions>iterationComposite</dfn>
6610+
: <dfn dict-member for=KeyframeEffectOptions>iterationComposite</dfn>
66156611
<span member-info for=KeyframeEffectOptions/iterationComposite></span>
66166612
:: The <a>iteration composite operation</a> used to define the way
66176613
animation values build from iteration to iteration.
66186614

6619-
: <dfn attribute for=KeyframeEffectOptions>composite</dfn>
6615+
: <dfn dict-member for=KeyframeEffectOptions>composite</dfn>
66206616
<span member-info for=KeyframeEffectOptions/composite></span>
66216617
:: The <a>composite operation</a> used to composite this
66226618
animation with the <a>animation stack</a>, as specified by one
66236619
of the <a>CompositeOperation</a> enumeration values.
66246620
This is used for all <a>keyframes</a> that do not specify
66256621
a <a>composite operation</a>.
66266622

6627-
: <dfn attribute for=KeyframeEffectOptions>spacing</dfn>
6623+
: <dfn dict-member for=KeyframeEffectOptions>spacing</dfn>
66286624
<span member-info for=KeyframeEffectOptions/spacing></span>
66296625
:: The <a title="keyframe spacing mode">spacing mode</a> to apply
66306626
to this <a>animation effect</a>'s <a>keyframes</a>.
@@ -6708,7 +6704,7 @@ <h3 id="the-keyframe-dictionary">The <code>Keyframe</code> dictionary</h3>
67086704

67096705
<div class='attributes'>
67106706

6711-
: <dfn attribute for=Keyframe>offset</dfn>
6707+
: <dfn dict-member for=Keyframe>offset</dfn>
67126708
<span member-info for=Keyframe/offset></span>
67136709
:: The <a>keyframe offset</a> of the <a>keyframe</a> specified as
67146710
a number between 0.0 and 1.0 inclusive or <code>null</code>.
@@ -6721,7 +6717,7 @@ <h3 id="the-keyframe-dictionary">The <code>Keyframe</code> dictionary</h3>
67216717
should be positioned using the <a>keyframe animation effect</a>'s
67226718
<a>keyframe spacing mode</a>.
67236719

6724-
: <dfn attribute for=Keyframe>easing</dfn>
6720+
: <dfn dict-member for=Keyframe>easing</dfn>
67256721
<span member-info for=Keyframe/easing></span>
67266722

67276723
:: The <a>timing function</a> used to transform the progress of time
@@ -6731,7 +6727,7 @@ <h3 id="the-keyframe-dictionary">The <code>Keyframe</code> dictionary</h3>
67316727
is identical to that defined for the <code>easing</code> attribute
67326728
of the {{AnimationTiming}} interface.
67336729

6734-
: <dfn attribute for=Keyframe>composite</dfn>
6730+
: <dfn dict-member for=Keyframe>composite</dfn>
67356731
<span member-info for=Keyframe/composite></span>
67366732

67376733
:: The <a>composite operation</a> used to combine the values
@@ -6898,7 +6894,7 @@ <h3 id="the-computedkeyframe-dictionary">The <code>ComputedKeyframe</code> dicti
68986894

68996895
<div class='attributes'>
69006896

6901-
: <dfn attribute for=ComputedKeyframe>computedOffset</dfn>
6897+
: <dfn dict-member for=ComputedKeyframe>computedOffset</dfn>
69026898
<span member-info for=ComputedKeyframe/computedOffset></span>
69036899
:: The <a>keyframe offset</a> calculated for this <a>keyframe</a> as
69046900
a result of applying the spacing procedure defined in
@@ -7015,33 +7011,33 @@ <h4 id="the-motionpatheffectoptions-dictionary">The <code>MotionPathEffectOption
70157011
};
70167012
</pre>
70177013

7018-
: <dfn attribute for='MotionPathEffectOptions'>autoRotate</dfn>
7014+
: <dfn dict-member for='MotionPathEffectOptions'>autoRotate</dfn>
70197015
<span member-info for='MotionPathEffectOptions/autoRotate'></span>
70207016
:: The <a>automatic rotation flag</a> setting for the generated
70217017
effect.
70227018

7023-
: <dfn attribute for='MotionPathEffectOptions'>angle</dfn>
7019+
: <dfn dict-member for='MotionPathEffectOptions'>angle</dfn>
70247020
<span member-info for='MotionPathEffectOptions/angle'></span>
70257021
:: The <a>rotation angle</a> for the generated effect.
70267022

7027-
: <dfn attribute for=MotionPathEffectOptions>name</dfn>
7023+
: <dfn dict-member for=MotionPathEffectOptions>name</dfn>
70287024
<span member-info for=MotionPathEffectOptions/name></span>
70297025
:: The value to set for the {{AnimationEffect}}'s {{AnimationEffect/name}}
70307026
property.
70317027

7032-
: <dfn attribute for='MotionPathEffectOptions'>iterationComposite</dfn>
7028+
: <dfn dict-member for='MotionPathEffectOptions'>iterationComposite</dfn>
70337029
<span member-info for='MotionPathEffectOptions/iterationComposite'></span>
70347030
:: The <a>iteration composite operation</a> used to define the way
70357031
animation values build from iteration to iteration.
70367032

7037-
: <dfn attribute for='MotionPathEffectOptions'>composite</dfn>
7033+
: <dfn dict-member for='MotionPathEffectOptions'>composite</dfn>
70387034
<span member-info for='MotionPathEffectOptions/composite'></span>
70397035
:: The <a>composite operation</a> used to composite this
70407036
<a>animation effect</a> with the <a>animation stack</a>, as
70417037
specified by one of the <a>CompositeOperation</a> enumeration
70427038
values.
70437039

7044-
: <dfn attribute for='MotionPathEffectOptions'>spacing</dfn>
7040+
: <dfn dict-member for='MotionPathEffectOptions'>spacing</dfn>
70457041
<span member-info for='MotionPathEffectOptions/spacing'></span>
70467042
:: The <a title="keyframe spacing mode">spacing mode</a> to apply
70477043
to this <a>motion path animation effect</a>.

0 commit comments

Comments
 (0)