Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-14 01:33:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ngShow/ngHide, ngIf): functions with zero args should be truthy

Browse source 
Previously, expressions that were a function with one or more arguments evaluated to
true, but functions with zero arguments evaluated to false.

This behavior seems both unintentional and undesirable. This patch makes a function
truthy regardless of its number of arguments.

Closes #5414
This commit is contained in:
Brian Ford 2014-01-02 14:48:03 -08:00
parent fd9a03e147
commit 01c5be4681
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Angular.js
View file

@ -959,7 +959,9 @@ function fromJson(json) {
function toBoolean(value) { function toBoolean(value) {
if (value && value.length !== 0) { if (typeof value === 'function') {
value = true;
} else if (value && value.length !== 0) {
var v = lowercase("" + value); var v = lowercase("" + value);
value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]'); value = !(v == 'f' || v == '0' || v == 'false' || v == 'no' || v == 'n' || v == '[]');
} else { } else {

10
test/ng/directive/ngShowHideSpec.js
View file

@ -20,6 +20,16 @@ describe('ngShow / ngHide', function() {
})); }));
// https://github.com/angular/angular.js/issues/5414
it('should show if the expression is a function with a no arguments', inject(function($rootScope, $compile) {
element = jqLite('<div ng-show="exp"></div>');
element = $compile(element)($rootScope);
$rootScope.exp = function(){};
$rootScope.$digest();
expect(element).toBeShown();
}));
it('should make hidden element visible', inject(function($rootScope, $compile) { it('should make hidden element visible', inject(function($rootScope, $compile) {
element = jqLite('<div class="ng-hide" ng-show="exp"></div>'); element = jqLite('<div class="ng-hide" ng-show="exp"></div>');
element = $compile(element)($rootScope); element = $compile(element)($rootScope);