diff options
| author | Di Peng | 2011-07-19 11:45:34 -0700 |
|---|---|---|
| committer | Igor Minar | 2011-07-26 14:21:13 -0700 |
| commit | f3e04fbd6a3ce9d84dec5052233a0712c2273859 (patch) | |
| tree | 48c26325987846bc8931a490193ae82687d4ffa4 /src | |
| parent | 00ea08e0ab2a0154e168e63f2505d885bbca9096 (diff) | |
| download | angular.js-f3e04fbd6a3ce9d84dec5052233a0712c2273859.tar.bz2 | |
fix(ng:show/ng:hide): use jqLite.show/jqLite.hide
The previous implementation didn't handle situation when in css
something was hidden with a cascaded display:none rule and then we
wanted to show it.
Unfortunatelly our test doesn't test this scenario because it's too
complicated. :-/
Diffstat (limited to 'src')
| -rw-r--r-- | src/Angular.js | 1 | ||||
| -rw-r--r-- | src/directives.js | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/Angular.js b/src/Angular.js index 28ece3d1..aeb1db4f 100644 --- a/src/Angular.js +++ b/src/Angular.js @@ -69,7 +69,6 @@ var _undefined = undefined, $function = 'function', $length = 'length', $name = 'name', - $none = 'none', $noop = 'noop', $null = 'null', $number = 'number', diff --git a/src/directives.js b/src/directives.js index d800aa80..d2f24a31 100644 --- a/src/directives.js +++ b/src/directives.js @@ -733,7 +733,7 @@ angularDirective("ng:class-even", ngClass(function(i){return i % 2 === 1;})); angularDirective("ng:show", function(expression, element){ return function(element){ this.$onEval(function(){ - element.css($display, toBoolean(this.$eval(expression)) ? '' : $none); + toBoolean(this.$eval(expression)) ? element.show() : element.hide(); }, element); }; }); @@ -774,7 +774,7 @@ angularDirective("ng:show", function(expression, element){ angularDirective("ng:hide", function(expression, element){ return function(element){ this.$onEval(function(){ - element.css($display, toBoolean(this.$eval(expression)) ? $none : ''); + toBoolean(this.$eval(expression)) ? element.hide() : element.show(); }, element); }; }); |
