aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng
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
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')
-rw-r--r--src/ng/animator.js11
-rwxr-xr-xsrc/ng/directive/ngIf.js10
-rw-r--r--src/ng/directive/ngInclude.js2
3 files changed, 11 insertions, 12 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; }
diff --git a/src/ng/directive/ngIf.js b/src/ng/directive/ngIf.js
index 492506c0..c8166ee5 100755
--- a/src/ng/directive/ngIf.js
+++ b/src/ng/directive/ngIf.js
@@ -52,7 +52,7 @@
</span>
</file>
<file name="animations.css">
- .example-leave-setup, .example-enter-setup {
+ .example-leave, .example-enter {
-webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
-ms-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
@@ -60,17 +60,17 @@
transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
}
- .example-enter-setup {
+ .example-enter {
opacity:0;
}
- .example-enter-setup.example-enter-start {
+ .example-enter.example-enter-active {
opacity:1;
}
- .example-leave-setup {
+ .example-leave {
opacity:1;
}
- .example-leave-setup.example-leave-start {
+ .example-leave.example-leave-active {
opacity:0;
}
</file>
diff --git a/src/ng/directive/ngInclude.js b/src/ng/directive/ngInclude.js
index 1187c733..adcc46e5 100644
--- a/src/ng/directive/ngInclude.js
+++ b/src/ng/directive/ngInclude.js
@@ -33,7 +33,7 @@
* - Otherwise enable scrolling only if the expression evaluates to truthy value.
*
* @example
- <example>
+ <example animations="true">
<file name="index.html">
<div ng-controller="Ctrl">
<select ng-model="template" ng-options="t.name for t in templates">