From a80049fd0ac858eeeb645a4209cb2a661d0b4c33 Mon Sep 17 00:00:00 2001
From: Igor Minar
Date: Tue, 31 Dec 2013 00:40:53 -0800
Subject: fix(input): use apply on change event only when one isn't already in
 progress

Closes #5293
---
 src/ng/directive/input.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'src/ng/directive/input.js')

diff --git a/src/ng/directive/input.js b/src/ng/directive/input.js
index c280b7c2..00c1c821 100644
--- a/src/ng/directive/input.js
+++ b/src/ng/directive/input.js
@@ -407,7 +407,7 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     });
   }
 
-  var listener = function(ev) {
+  var listener = function() {
     if (composing) return;
     var value = element.val();
 
@@ -419,11 +419,7 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     }
 
     if (ctrl.$viewValue !== value) {
-      // If an event was performed natively, jQuery sets the isTrigger property.
-      // When triggering event manually, the field is not present. Manually
-      // triggered events are performed synchronously which causes the "$digest
-      // already in progress" error.
-      if (ev && ev.isTrigger) {
+      if (scope.$$phase) {
         ctrl.$setViewValue(value);
       } else {
         scope.$apply(function() {
-- 
cgit v1.2.3