aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/animator.js
diff options
context:
space:
mode:
authorMatias Niemelä2013-05-13 14:06:50 +0100
committerPete Bacon Darwin2013-05-13 14:09:03 +0100
commit3e4d43b42c37b589eb75c740998b671de8a5f263 (patch)
tree560d4b25ff3821b09fe12509160ef96de6ab34a0 /src/ng/animator.js
parent3952d35abe334a0e6afd1f6e34a74d984d1e9d24 (diff)
downloadangular.js-3e4d43b42c37b589eb75c740998b671de8a5f263.tar.bz2
docs(animation): fix code example to work with most recent ngAnimate
ngAnimate: Rename CSS classes in example code to work with new ngAnimate naming conventions ngInclude: Include animations toggle in ngInclude example code ngAnimate: Remove ms- prefix and fix up CSS animation example code
Diffstat (limited to 'src/ng/animator.js')
-rw-r--r--src/ng/animator.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/ng/animator.js b/src/ng/animator.js
index faf2ed40..1f589e91 100644
--- a/src/ng/animator.js
+++ b/src/ng/animator.js
@@ -61,9 +61,8 @@
* .animate-enter {
* -webkit-transition: 1s linear all; /* Safari/Chrome */
* -moz-transition: 1s linear all; /* Firefox */
- * -ms-transition: 1s linear all; /* IE10 */
* -o-transition: 1s linear all; /* Opera */
- * transition: 1s linear all; /* Future Browsers */
+ * transition: 1s linear all; /* IE10+ and Future Browsers */
*
* /* The animation preparation code */
* opacity: 0;
@@ -88,10 +87,10 @@
* <pre>
* <style type="text/css">
* .animate-enter {
- * -webkit-animation: enter_sequence 1s linear;
- * -moz-animation: enter_sequence 1s linear;
- * -o-animation: enter_sequence 1s linear;
- * animation: enter_sequence 1s linear;
+ * -webkit-animation: enter_sequence 1s linear; /&#42; Safari/Chrome &#42;/
+ * -moz-animation: enter_sequence 1s linear; /&#42; Firefox &#42;/
+ * -o-animation: enter_sequence 1s linear; /&#42; Opera &#42;/
+ * animation: enter_sequence 1s linear; /&#42; IE10+ and Future Browsers &#42;/
* }
* &#64-webkit-keyframes enter_sequence {
* from { opacity:0; }