Skip to content

Commit f65d262

Browse files
committed
[css-transitions] Move paragraphs about how to interpolate values to the new (and now more appropriate) section on how transitions apply.
1 parent f3c2d10 commit f65d262

2 files changed

Lines changed: 43 additions & 42 deletions

File tree

css-transitions/Overview.html

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,16 +1093,30 @@ <h2 id=application><span class=secno>4. </span> Application of transitions</h2>
10931093

10941094
<p> If the current time is after the <a href="#start-time">start time</a>
10951095
of the transition (that is, during the duration phase of the transition),
1096-
this value is a specified style that will compute to the <a
1097-
href="#animatable-types">result of interpolating the property</a> using
1098-
the <span>before-change style</span> for the property as
1099-
<i>V</i><sub>start</sub>, using the <span>after-change style</span> for
1100-
the property as <i>V</i><sub>end</sub>, and using (current time - start
1101-
time) / (end time - start time) as the input to the timing function. (The
1096+
this value is a specified style that will compute to the result of
1097+
interpolating the property using the <span>before-change style</span> for
1098+
the property as <i>V</i><sub>start</sub>, using the <span>after-change
1099+
style</span> for the property as <i>V</i><sub>end</sub>, and using
1100+
(current time - start time) / (end time - start time) as the input to the
1101+
timing function (see ‘<a href="#transition-timing-function"><code
1102+
class=property>transition-timing-function</code></a>’). (The
11021103
<span>before-change style</span> and <span>after-change style</span> <a
11031104
href="#style-change-event">style change event</a> in which the transition
11041105
was started.)
11051106

1107+
<p> When interpolating between two values, <i>V</i><sub>start</sub> and
1108+
<i>V</i><sub>end</sub>, interpolation is done using the output <i>p</i> of
1109+
the timing function, which gives the portion of the value space that the
1110+
interpolation has crossed. Thus the result of the interpolation is
1111+
<i>V</i><sub>res</sub> = (1 - <i>p</i>) ⋅ <i>V</i><sub>start</sub> +
1112+
<i>p</i><i>V</i><sub>end</sub>.
1113+
1114+
<p> However, if this value (<i>V</i><sub>res</sub>) is outside the allowed
1115+
range of values for the property, then it is clamped to that range. This
1116+
can occur if <i>p</i> is outside of the range 0 to 1, which can occur if a
1117+
timing function is specified with a <i>y1</i> or <i>y2</i> that is outside
1118+
the range 0 to 1.
1119+
11061120
<h2 id=reversing><span class=secno>5. </span> Automatically reversing
11071121
interrupted transitions</h2>
11081122

@@ -1293,19 +1307,6 @@ <h2 id=transition-events><span class=secno>6. </span><a
12931307
<h2 id=animatable-types><span class=secno>7. </span><a
12941308
id=animation-of-property-types-> Animation of property types </a></h2>
12951309

1296-
<p> When interpolating between two values, <i>V</i><sub>start</sub> and
1297-
<i>V</i><sub>end</sub>, interpolation is done using the output <i>p</i> of
1298-
the timing function, which gives the portion of the value space that the
1299-
interpolation has crossed. Thus the result of the interpolation is
1300-
<i>V</i><sub>res</sub> = (1 - <i>p</i>) ⋅ <i>V</i><sub>start</sub> +
1301-
<i>p</i><i>V</i><sub>end</sub>.
1302-
1303-
<p> However, if this value (<i>V</i><sub>res</sub>) is outside the allowed
1304-
range of values for the property, then it is clamped to that range. This
1305-
can occur if <i>p</i> is outside of the range 0 to 1, which can occur if a
1306-
timing function is specified with a <i>y1</i> or <i>y2</i> that is outside
1307-
the range 0 to 1.
1308-
13091310
<p> The following describes how each property type undergoes transition or
13101311
animation.
13111312

css-transitions/Overview.src.html

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1118,17 +1118,38 @@ <h2 id="application">
11181118
<span>start time</span> of the transition
11191119
(that is, during the duration phase of the transition),
11201120
this value is a specified style that will compute
1121-
to the <a href="#animatable-types">result of interpolating the property</a>
1121+
to the result of interpolating the property
11221122
using the <span>before-change style</span> for the property as
11231123
<i>V</i><sub>start</sub>,
11241124
using the <span>after-change style</span> for the property as
11251125
<i>V</i><sub>end</sub>,
11261126
and using (current time - start time) / (end time - start time)
1127-
as the input to the timing function.
1127+
as the input to the timing function (see 'transition-timing-function').
11281128
(The <span>before-change style</span> and <span>after-change style</span>
11291129
<span>style change event</span> in which the transition was started.)
11301130
</p>
11311131

1132+
<p>
1133+
When interpolating between two values,
1134+
<i>V</i><sub>start</sub> and <i>V</i><sub>end</sub>,
1135+
interpolation is done using the output <i>p</i> of the timing function,
1136+
which gives the portion of the value space
1137+
that the interpolation has crossed.
1138+
Thus the result of the interpolation is
1139+
<i>V</i><sub>res</sub> =
1140+
(1 - <i>p</i>) &sdot; <i>V</i><sub>start</sub> +
1141+
<i>p</i> &sdot; <i>V</i><sub>end</sub>.
1142+
</p>
1143+
1144+
<p>
1145+
However, if this value (<i>V</i><sub>res</sub>)
1146+
is outside the allowed range of values for the property,
1147+
then it is clamped to that range.
1148+
This can occur if <i>p</i> is outside of the range 0 to 1,
1149+
which can occur if a timing function is specified
1150+
with a <i>y1</i> or <i>y2</i> that is outside the range 0 to 1.
1151+
</p>
1152+
11321153
<h2 id="reversing">
11331154
Automatically reversing interrupted transitions
11341155
</h2>
@@ -1323,27 +1344,6 @@ <h2 id="animatable-types"><a id="animation-of-property-types-">
13231344
Animation of property types
13241345
</a></h2>
13251346

1326-
<p>
1327-
When interpolating between two values,
1328-
<i>V</i><sub>start</sub> and <i>V</i><sub>end</sub>,
1329-
interpolation is done using the output <i>p</i> of the timing function,
1330-
which gives the portion of the value space
1331-
that the interpolation has crossed.
1332-
Thus the result of the interpolation is
1333-
<i>V</i><sub>res</sub> =
1334-
(1 - <i>p</i>) &sdot; <i>V</i><sub>start</sub> +
1335-
<i>p</i> &sdot; <i>V</i><sub>end</sub>.
1336-
</p>
1337-
1338-
<p>
1339-
However, if this value (<i>V</i><sub>res</sub>)
1340-
is outside the allowed range of values for the property,
1341-
then it is clamped to that range.
1342-
This can occur if <i>p</i> is outside of the range 0 to 1,
1343-
which can occur if a timing function is specified
1344-
with a <i>y1</i> or <i>y2</i> that is outside the range 0 to 1.
1345-
</p>
1346-
13471347
<p>
13481348
The following describes how each property type undergoes transition or
13491349
animation.

0 commit comments

Comments
 (0)