diff options
| -rw-r--r-- | src/ng/animator.js | 11 | ||||
| -rwxr-xr-x | src/ng/directive/ngIf.js | 10 | ||||
| -rw-r--r-- | src/ng/directive/ngInclude.js | 2 |
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; /* Safari/Chrome */ + * -moz-animation: enter_sequence 1s linear; /* Firefox */ + * -o-animation: enter_sequence 1s linear; /* Opera */ + * animation: enter_sequence 1s linear; /* IE10+ and Future Browsers */ * } * @-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"> |