aboutsummaryrefslogtreecommitdiffstats
path: root/src/ng/directive/ngShowHide.js
diff options
context:
space:
mode:
authorMatias Niemelä2013-07-29 19:45:59 -0400
committerMisko Hevery2013-07-29 21:22:05 -0700
commite1fe2ac2691e319473ed2bbca501fc6b641024e5 (patch)
treed6900400222e74403fdc5bed1d5ce4c038bda2f0 /src/ng/directive/ngShowHide.js
parent33d45d8fafb5abf99e6fd811cad1dd57daab918b (diff)
downloadangular.js-e1fe2ac2691e319473ed2bbca501fc6b641024e5.tar.bz2
chore(ngdocs): all animation-supported directives working with docs examples and jsFiddle/Plunkr pages
Diffstat (limited to 'src/ng/directive/ngShowHide.js')
-rw-r--r--src/ng/directive/ngShowHide.js71
1 files changed, 22 insertions, 49 deletions
diff --git a/src/ng/directive/ngShowHide.js b/src/ng/directive/ngShowHide.js
index 1bba11ef..e5ce713d 100644
--- a/src/ng/directive/ngShowHide.js
+++ b/src/ng/directive/ngShowHide.js
@@ -27,56 +27,42 @@
Click me: <input type="checkbox" ng-model="checked"><br/>
<div>
Show:
- <span class="check-element example-show-hide" ng-show="checked">
+ <div class="check-element animate-show" ng-show="checked">
<span class="icon-thumbs-up"></span> I show up when your checkbox is checked.
- </span>
+ </div>
</div>
<div>
Hide:
- <span class="check-element example-show-hide" ng-hide="checked">
+ <div class="check-element animate-show" ng-hide="checked">
<span class="icon-thumbs-down"></span> I hide when your checkbox is checked.
- </span>
+ </div>
</div>
</file>
<file name="animations.css">
- .example-show-hide {
+ .animate-show.ng-hide-add,
+ .animate-show.ng-hide-remove {
-webkit-transition:all linear 0.5s;
-moz-transition:all linear 0.5s;
- -ms-transition:all linear 0.5s;
-o-transition:all linear 0.5s;
transition:all linear 0.5s;
- display:block;
- }
- .example-show-hide.ng-hide {
- display:none;
+ display:block!important;
}
- .example-show-hide.ng-hide-remove {
- display:block;
+ .animate-show.ng-hide-add.ng-hide-add-active,
+ .animate-show.ng-hide-remove {
line-height:0;
opacity:0;
padding:0 10px;
}
- .example-show-hide.ng-hide-remove.ng-hide-remove-active {
- line-height:20px;
- opacity:1;
- padding:10px;
- border:1px solid black;
- background:white;
- }
- .example-show-hide.ng-hide-add {
+ .animate-show.ng-hide-add,
+ .animate-show.ng-hide-remove.ng-hide-remove-active {
line-height:20px;
opacity:1;
padding:10px;
border:1px solid black;
background:white;
}
- .example-show-hide.ng-hide-add.ng-hide-add-active {
- line-height:0;
- opacity:0;
- padding:0 10px;
- }
.check-element {
padding:10px;
@@ -132,55 +118,42 @@ var ngShowDirective = ['$animate', function($animate) {
Click me: <input type="checkbox" ng-model="checked"><br/>
<div>
Show:
- <span class="check-element example-show-hide" ng-show="checked">
+ <div class="check-element animate-hide" ng-show="checked">
<span class="icon-thumbs-up"></span> I show up when your checkbox is checked.
- </span>
+ </div>
</div>
<div>
Hide:
- <span class="check-element example-show-hide" ng-hide="checked">
+ <div class="check-element animate-hide" ng-hide="checked">
<span class="icon-thumbs-down"></span> I hide when your checkbox is checked.
- </span>
+ </div>
</div>
</file>
<file name="animations.css">
- .example-show-hide {
+ .animate-hide.ng-hide-add,
+ .animate-hide.ng-hide-remove {
-webkit-transition:all linear 0.5s;
-moz-transition:all linear 0.5s;
-o-transition:all linear 0.5s;
transition:all linear 0.5s;
- display:block;
- }
- .example-show-hide.ng-hide {
- display:none;
+ display:block!important;
}
- .example-show-hide.ng-hide-remove {
- display:block;
+ .animate-hide.ng-hide-add.ng-hide-add-active,
+ .animate-hide.ng-hide-remove {
line-height:0;
opacity:0;
padding:0 10px;
}
- .example-show-hide.ng-hide-remove.ng-hide-remove-active {
- line-height:20px;
- opacity:1;
- padding:10px;
- border:1px solid black;
- background:white;
- }
- .example-show-hide.ng-hide-add {
+ .animate-hide.ng-hide-add,
+ .animate-hide.ng-hide-remove.ng-hide-remove-active {
line-height:20px;
opacity:1;
padding:10px;
border:1px solid black;
background:white;
}
- .example-show-hide.ng-hide-add.ng-hide-add-active {
- line-height:0;
- opacity:0;
- padding:0 10px;
- }
.check-element {
padding:10px;