diff options
| author | Julien Bouquillon | 2013-07-05 02:07:12 +0200 | 
|---|---|---|
| committer | Igor Minar | 2013-07-24 16:58:12 -0700 | 
| commit | e03402433d2524fd3a74bbfce984f843794996ce (patch) | |
| tree | dd119074f98f1b476b373aee88b1df0176fecbca /src | |
| parent | 52b8211fd0154b9d6b771a83573a161f5580d92c (diff) | |
| download | angular.js-e03402433d2524fd3a74bbfce984f843794996ce.tar.bz2 | |
fix(ngMobile): prevent ngClick when item disabled
 - the ngClick attribute was always triggered, regardless the ngDisabled/disabled attributes
 - we now check the DOM disabled status before triggering the original click event
Closes #3124
Closes #3132
Diffstat (limited to 'src')
| -rw-r--r-- | src/ngMobile/directive/ngClick.js | 9 | 
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ngMobile/directive/ngClick.js b/src/ngMobile/directive/ngClick.js index 3fa68cb4..358a1af9 100644 --- a/src/ngMobile/directive/ngClick.js +++ b/src/ngMobile/directive/ngClick.js @@ -232,10 +232,11 @@ ngMobile.directive('ngClick', ['$parse', '$timeout', '$rootElement',            tapElement.blur();          } -        scope.$apply(function() { -          // TODO(braden): This is sending the touchend, not a tap or click. Is that kosher? -          clickHandler(scope, {$event: event}); -        }); +        if (!angular.isDefined(attr.disabled) || attr.disabled === false) { +          scope.$apply(function() { +            clickHandler(scope, {$event: event}); +          }); +        }        }        resetState();  | 
