Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 3e4d43b

Browse files
matskopetebacondarwin
authored andcommitted
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
1 parent 3952d35 commit 3e4d43b

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

src/ng/animator.js

+5-6
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,8 @@
6161
* .animate-enter {
6262
* -webkit-transition: 1s linear all; /* Safari/Chrome */
6363
* -moz-transition: 1s linear all; /* Firefox */
64-
* -ms-transition: 1s linear all; /* IE10 */
6564
* -o-transition: 1s linear all; /* Opera */
66-
* transition: 1s linear all; /* Future Browsers */
65+
* transition: 1s linear all; /* IE10+ and Future Browsers */
6766
*
6867
* /* The animation preparation code */
6968
* opacity: 0;
@@ -88,10 +87,10 @@
8887
* <pre>
8988
* <style type="text/css">
9089
* .animate-enter {
91-
* -webkit-animation: enter_sequence 1s linear;
92-
* -moz-animation: enter_sequence 1s linear;
93-
* -o-animation: enter_sequence 1s linear;
94-
* animation: enter_sequence 1s linear;
90+
* -webkit-animation: enter_sequence 1s linear; /&#42; Safari/Chrome &#42;/
91+
* -moz-animation: enter_sequence 1s linear; /&#42; Firefox &#42;/
92+
* -o-animation: enter_sequence 1s linear; /&#42; Opera &#42;/
93+
* animation: enter_sequence 1s linear; /&#42; IE10+ and Future Browsers &#42;/
9594
* }
9695
* &#64-webkit-keyframes enter_sequence {
9796
* from { opacity:0; }

src/ng/directive/ngIf.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -52,25 +52,25 @@
5252
</span>
5353
</file>
5454
<file name="animations.css">
55-
.example-leave-setup, .example-enter-setup {
55+
.example-leave, .example-enter {
5656
-webkit-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
5757
-moz-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
5858
-ms-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
5959
-o-transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
6060
transition:all cubic-bezier(0.250, 0.460, 0.450, 0.940) 0.5s;
6161
}
6262
63-
.example-enter-setup {
63+
.example-enter {
6464
opacity:0;
6565
}
66-
.example-enter-setup.example-enter-start {
66+
.example-enter.example-enter-active {
6767
opacity:1;
6868
}
6969
70-
.example-leave-setup {
70+
.example-leave {
7171
opacity:1;
7272
}
73-
.example-leave-setup.example-leave-start {
73+
.example-leave.example-leave-active {
7474
opacity:0;
7575
}
7676
</file>

src/ng/directive/ngInclude.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* - Otherwise enable scrolling only if the expression evaluates to truthy value.
3434
*
3535
* @example
36-
<example>
36+
<example animations="true">
3737
<file name="index.html">
3838
<div ng-controller="Ctrl">
3939
<select ng-model="template" ng-options="t.name for t in templates">

0 commit comments

Comments
 (0)