Skip to content

Commit 79b5424

Browse files
birtlessvgeesus
authored andcommitted
Backport fixes made to WD to ED
1 parent 548bcde commit 79b5424

4 files changed

Lines changed: 19 additions & 25 deletions

File tree

web-animations/WD-web-animations-20140605/Overview.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6077,15 +6077,15 @@ <h3><span class="secno">5.9 </span>The <code>Animation</code> interface</h3>
60776077
<a href="#dfn-animation" class="internalDFN">Animations</a> are represented by the
60786078
<code>Animation</code> interface.
60796079
</p>
6080-
<pre class="idl"><span class="idlInterface" id="idl-def-Animation">[<span class="idlCtor"><span class="idlCtorName"><a href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput------------------timing">Constructor</a></span> (<span class="idlParam"><span class="idlParamType"><a href="#idl-def-Animatable" class="idlType"><code>Animatable</code></a>?</span> <span class="idlParamName">target</span></span>, <span class="idlParam"><span class="idlParamType"><a>object</a>?</span> <span class="idlParamName">effect</span></span>,
6080+
<pre class="idl"><span class="idlInterface" id="idl-def-Animation">[<span class="idlCtor"><span class="idlCtorName"><a href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Constructor</a></span> (<span class="idlParam"><span class="idlParamType"><a href="#idl-def-Animatable" class="idlType"><code>Animatable</code></a>?</span> <span class="idlParamName">target</span></span>, <span class="idlParam"><span class="idlParamType"><a>object</a>?</span> <span class="idlParamName">effect</span></span>,
60816081
<span class="idlParam">optional <span class="idlParamType"><a>(unrestricted double or AnimationTimingInput)
60826082
</a></span> <span class="idlParamName">timing</span></span>)</span>]
60836083
interface <span class="idlInterfaceID">Animation</span> : <span class="idlSuperclass"><a href="#idl-def-AnimationNode" class="idlType"><code>AnimationNode</code></a></span> {
60846084
<span class="idlAttribute"> attribute <span class="idlAttrType">(<a href="#idl-def-AnimationEffect" class="idlType"><code>AnimationEffect</code></a> or <a href="#idl-def-EffectCallback" class="idlType"><code>EffectCallback</code></a>)?</span> <span class="idlAttrName"><a href="#widl-Animation-effect">effect</a></span>;</span>
60856085
<span class="idlAttribute"> attribute <span class="idlAttrType"><a href="#idl-def-Animatable" class="idlType"><code>Animatable</code></a>?</span> <span class="idlAttrName"><a href="#widl-Animation-target">target</a></span>;</span>
60866086
<span class="idlMethod"> <span class="idlMethType"><a href="#idl-def-Animation" class="idlType"><code>Animation</code></a></span> <span class="idlMethName"><a href="#widl-Animation-clone-Animation">clone</a></span> ();</span>
60876087
};</span>
6088-
</pre><section id="constructors-2"><h4><span class="secno">5.9.1 </span>Constructors</h4><dl class="constructors"><dt id="widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput------------------timing"><code>Animation</code></dt><dd>
6088+
</pre><section id="constructors-2"><h4><span class="secno">5.9.1 </span>Constructors</h4><dl class="constructors"><dt id="widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing"><code>Animation</code></dt><dd>
60896089
<p>
60906090
Creates a new <a title="Animation interface" href="#idl-def-Animation" class="idlType"><code>Animation</code></a> object
60916091
using the following procedure:
@@ -7634,7 +7634,7 @@ <h3><span class="secno">8.2 </span>Conformance criteria</h3>
76347634
<span class="idlMethod"> <span class="idlMethType"><a href="#idl-def-AnimationSequence" class="idlType"><code>AnimationSequence</code></a></span> <span class="idlMethName"><a href="#widl-AnimationSequence-clone-AnimationSequence">clone</a></span> ();</span>
76357635
};</span>
76367636

7637-
<span class="idlInterface" id="idl-def-Animation-s">[<span class="idlCtor"><span class="idlCtorName"><a href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput------------------timing">Constructor</a></span> (<span class="idlParam"><span class="idlParamType"><a href="#idl-def-Animatable" class="idlType"><code>Animatable</code></a>?</span> <span class="idlParamName">target</span></span>, <span class="idlParam"><span class="idlParamType"><a>object</a>?</span> <span class="idlParamName">effect</span></span>,
7637+
<span class="idlInterface" id="idl-def-Animation-s">[<span class="idlCtor"><span class="idlCtorName"><a href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Constructor</a></span> (<span class="idlParam"><span class="idlParamType"><a href="#idl-def-Animatable" class="idlType"><code>Animatable</code></a>?</span> <span class="idlParamName">target</span></span>, <span class="idlParam"><span class="idlParamType"><a>object</a>?</span> <span class="idlParamName">effect</span></span>,
76387638
<span class="idlParam">optional <span class="idlParamType"><a>(unrestricted double or AnimationTimingInput)
76397639
</a></span> <span class="idlParamName">timing</span></span>)</span>]
76407640
interface <span class="idlInterfaceID">Animation</span> : <span class="idlSuperclass"><a href="#idl-def-AnimationNode" class="idlType"><code>AnimationNode</code></a></span> {
@@ -7940,7 +7940,7 @@ <h3><span class="secno">8.2 </span>Conformance criteria</h3>
79407940
</section>
79417941

79427942

7943-
<section id="references" class="appendix"><!--OddPage--><h2><span class="secno">D. </span>References</h2><section id="normative-references"><h3><span class="secno">D.1 </span>Normative references</h3><dl class="bibliography"><dt id="bib-CSS21/">[CSS21]</dt><dd>Bert Bos; et al. <a href="http://www.w3.org/TR/CSS21/"><cite>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a>. W3C Recommendation. URL: <a href="http://www.w3.org/TR/CSS21/">http://www.w3.org/TR/CSS21/</a>
7943+
<section id="references" class="appendix"><!--OddPage--><h2><span class="secno">D. </span>References</h2><section id="normative-references"><h3><span class="secno">D.1 </span>Normative references</h3><dl class="bibliography"><dt id="bib-CSS21">[CSS21]</dt><dd>Bert Bos; et al. <a href="http://www.w3.org/TR/CSS21/"><cite>Cascading Style Sheets Level 2 Revision 1 (CSS 2.1) Specification.</cite></a>. W3C Recommendation. URL: <a href="http://www.w3.org/TR/CSS21/">http://www.w3.org/TR/CSS21/</a>
79447944
</dd><dt id="bib-CSS3-VALUES">[CSS3-VALUES]</dt><dd>H&#xe5;kon Wium Lie; Tab Atkins; Elika J. Etemad. <a href="http://www.w3.org/TR/css3-values/"><cite>CSS Values and Units Module Level 3.</cite></a> 4 April 2013. W3C Candidate Recommendation. URL: <a href="http://www.w3.org/TR/css3-values/">http://www.w3.org/TR/css3-values/</a>
79457945
</dd><dt id="bib-CSSOM">[CSSOM]</dt><dd>Anne van Kesteren. <a href="http://www.w3.org/TR/cssom/"><cite>CSSOM View Module.</cite></a> 12 July 2011. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/cssom/">http://www.w3.org/TR/cssom/</a>
79467946
</dd><dt id="bib-DOM4">[DOM4]</dt><dd>Anne van Kesteren; Aryeh Gregor; Lachlan Hunt; Ms2ger. <a href="http://www.w3.org/TR/dom/"><cite>DOM4.</cite></a> 6 December 2012. W3C Working Draft. (Work in progress.) URL: <a href="http://www.w3.org/TR/dom/">http://www.w3.org/TR/dom/</a>

web-animations/index.html

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,13 @@
9494
// This is important for Rec-track documents, do not copy a patent URI
9595
// from a random document unless you know what you're doing. If in
9696
// doubt ask your friendly neighbourhood Team Contact.
97-
wgPatentURI: "",
97+
wgPatentURI: [ "http://www.w3.org/2004/01/pp-impl/32061/status",
98+
"http://www.w3.org/2004/01/pp-impl/19480/status" ],
9899

99100
noIDLSorting: true,
100101
noIDLIn: true
101102
};
102103
</script>
103-
<!--
104-
ReSpec.js wishlist:
105-
106-
Add here any issues you find with ReSpec including missing features. It
107-
will help us decide if we should continue using it and work out what we
108-
need to fix.
109-
110-
* Allow making cross-references to specific methods and members.
111-
-->
112104
</head>
113105
<body>
114106
<section id="abstract">
@@ -5140,7 +5132,7 @@ <h3>The intermediate animation value of a motion path animation effect</h3>
51405132
</ol>
51415133
<div class="issue">
51425134
Need to describe how <a
5143-
href="http://www.w3.org/TR/css3-transforms/#transform-origin">transform-origin</a>
5135+
href="http://www.w3.org/TR/css3-transforms/#transform-origin-property">transform-origin</a>
51445136
is applied.
51455137
</div>
51465138
</section>
@@ -5176,7 +5168,7 @@ <h3>Custom effects</h3>
51765168
</p>
51775169
<p>
51785170
For example, using a <a>custom effect</a> that draws to a <a
5179-
href="http://www.w3.org/TR/html5/embedded-content-0.html#the-canvas-element"><code>canvas</code></a>
5171+
href="http://www.w3.org/TR/html5/scripting-1.html#the-canvas-element"><code>canvas</code></a>
51805172
element, it is possible to produce a complex animated effect
51815173
featuring patterns that may be difficult to create using CSS or
51825174
SVG.
@@ -6554,7 +6546,7 @@ <h3>The <code>Animation</code> interface</h3>
65546546
<div class="note">
65556547
<p>
65566548
Note that as with <a
6557-
href="#widl-ctor-AnimationGroup--sequence-AnimationNode--children--unrestricted-double-or-AnimationTimingInput--timing">the
6549+
href="#widl-ctor-AnimationGroup-sequence-AnimationNode--children--unrestricted-double-or-AnimationTimingInput--timing">the
65586550
constructor for <a>AnimationGroup</a></a>s
65596551
it is possible to pass in an <a>AnimationTiming</a> object here
65606552
(e.g. the <code>timing</code> member of another
@@ -6689,7 +6681,7 @@ <h3>The <code>Animation</code> interface</h3>
66896681
</li>
66906682
<li>Return a new <a>Animation</a> object created by
66916683
calling the <a
6692-
href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
6684+
href="#widl-ctor-Animation-Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
66936685
constructor</a> with parameters
66946686
<code>Animation(<var>source</var>.target, <var>cloned
66956687
effect</var>, <var>cloned timing</var>)</code>.</li>
@@ -6875,15 +6867,15 @@ <h3>The <code>Animatable</code> interface</h3>
68756867
<dd>
68766868
The effect to apply.
68776869
This value is passed to the <a
6878-
href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
6870+
href="#widl-ctor-Animation-Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
68796871
constructor</a> as the <var>effect</var> parameter and has the
68806872
same interpretation as defined for that constructor.
68816873
</dd>
68826874
<dt>optional (double or AnimationTimingInput) timing</dt>
68836875
<dd>
68846876
The timing parameters of the animation.
68856877
This value is passed to the <a
6886-
href="#widl-ctor-Animation--Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
6878+
href="#widl-ctor-Animation-Animatable-target-object-effect--unrestricted-double-or-AnimationTimingInput--timing">Animation
68876879
constructor</a> as the <var>timing</var> parameter and has the
68886880
same interpretation as defined for that constructor.
68896881
</dd>

web-animations/respec/bibref/biblio.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.

web-animations/respec/respec.js

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2612,13 +2612,15 @@ berjon.WebIDLProcessor.prototype = {
26122612
makeMethodID: function (cur, obj) {
26132613
var refId = obj.refId ? obj.refId
26142614
: obj.special ? obj.special : "anon";
2615-
var id = cur + refId + "-" + obj.datatype + "-";
2615+
var id = cur + refId + " " + obj.datatype + " ";
26162616
var params = [];
26172617
for (var i = 0, n = obj.params.length; i < n; i++) {
26182618
var prm = obj.params[i];
2619-
params.push(prm.datatype + (prm.array ? "Array" : "") + "-" + prm.id)
2619+
params.push(prm.datatype + (prm.array ? "Array" : "") + " " + prm.id)
26202620
}
2621-
id += params.join("-");
2621+
id += params.join(" ");
2622+
// Don't make contiguous whitespace significant
2623+
id = id.replace(/\s+/g, " ");
26222624
return sn.sanitiseID(id);
26232625
// return sn.idThatDoesNotExist(id);
26242626
},

0 commit comments

Comments
 (0)