TESTING: Revert "fix(inputs): ignoring input events in IE caused by placeholder changes or focus/blur on inputs with placeholders"

This reverts commit 5a591f7.

Conflicts:
	src/ngScenario/dsl.js

Author: caitp

src/ng/directive/input.js

@@ -944,6 +944,7 @@ function textInputType(scope, element, attr, ctrl, $sniffer, $browser) {
 
 function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
   var validity = element.prop(VALIDITY_STATE_PROPERTY);
+  var placeholder = element[0].placeholder, noevent = {};
   var type = lowercase(element[0].type);
 
   // In composition mode, users are still inputing intermediate text buffer,
@@ -967,6 +968,15 @@ function baseInputType(scope, element, attr, ctrl, $sniffer, $browser) {
     var value = element.val(),
         event = ev && ev.type;
 
+    // IE (11 and under) seem to emit an 'input' event if the placeholder value changes.
+    // We don't want to dirty the value when this happens, so we abort here. Unfortunately,
+    // IE also sends input events for other non-input-related things, (such as focusing on a
+    // form control), so this change is not entirely enough to solve this.
+    if (msie && (ev || noevent).type === 'input' && element[0].placeholder !== placeholder) {
+      placeholder = element[0].placeholder;
+      return;
+    }
+
     // By default we will trim the value
     // If the attribute ng-trim exists we will avoid trimming
     // If input type is 'password', the value is never trimmed

src/ng/sniffer.js

@@ -67,9 +67,7 @@ function $SnifferProvider() {
         // IE9 implements 'input' event it's so fubared that we rather pretend that it doesn't have
         // it. In particular the event is not fired when backspace or delete key are pressed or
         // when cut operation is performed.
-        // IE10+ implements 'input' event but it erroneously fires under various situations,
-        // e.g. when placeholder changes, or a form is focused.
-        if (event === 'input' && msie <= 11) return false;
+        if (event == 'input' && msie == 9) return false;
 
         if (isUndefined(eventSupport[event])) {
           var divElm = document.createElement('div');

src/ngScenario/dsl.js

@@ -199,12 +199,7 @@ angular.scenario.dsl('binding', function() {
  */
 angular.scenario.dsl('input', function() {
   var chain = {};
-  var supportInputEvent =  'oninput' in document.createElement('div');
-
-  if (msie < 12) {
-    // IE10/11 have many bugs with input event, don't use it.
-    supportInputEvent = false;
-  }
+  var supportInputEvent =  'oninput' in document.createElement('div') && msie != 9;
 
   chain.enter = function(value, event) {
     return this.addFutureAction("input '" + this.name + "' enter '" + value + "'",

test/ng/directive/inputSpec.js

@@ -1370,188 +1370,22 @@ describe('input', function() {
     expect(scope.name).toEqual('caitp');
   });
 
-  describe("IE placeholder input events", function() {
-    //IE fires an input event whenever a placeholder visually changes, essentially treating it as a value
-    //Events:
-    //  placeholder attribute change: *input*
-    //  focus (which visually removes the placeholder value): focusin focus *input*
-    //  blur (which visually creates the placeholder value):  focusout *input* blur
-    //However none of these occur if the placeholder is not visible at the time of the event.
-    //These tests try simulate various scenerios which do/do-not fire the extra input event
-
-    it('should not dirty the model on an input event in response to a placeholder change', function() {
-      if (msie) {
-        compileInput('<input type="text" placeholder="Test" attr-capture ng-model="unsetValue" name="name" />');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test');
-        expect(inputElm).toBePristine();
-
-        attrs.$set('placeholder', '');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('');
-        expect(inputElm).toBePristine();
-
-        attrs.$set('placeholder', 'Test Again');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test Again');
-        expect(inputElm).toBePristine();
-
-        attrs.$set('placeholder', undefined);
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe(undefined);
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    });
-
-    it('should not dirty the model on an input event in response to a interpolated placeholder change', inject(function($rootScope) {
-      if (msie) {
-        compileInput('<input type="text" placeholder="{{ph}}" ng-model="unsetValue" name="name" />');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        $rootScope.ph = 1;
-        $rootScope.$digest();
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        $rootScope.ph = "";
-        $rootScope.$digest();
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-
-    it('should dirty the model on an input event in response to a placeholder change while in focus', inject(function($rootScope) {
-      if (msie) {
-        $rootScope.ph = 'Test';
-        compileInput('<input type="text" ng-attr-placeholder="{{ph}}" ng-model="unsetValue" name="name" />');
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusin');
-        browserTrigger(inputElm, 'focus');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test');
-        expect(inputElm).toBePristine();
-
-        $rootScope.ph = 'Test Again';
-        $rootScope.$digest();
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-
-    it('should not dirty the model on an input event in response to a ng-attr-placeholder change', inject(function($rootScope) {
-      if (msie) {
-        compileInput('<input type="text" ng-attr-placeholder="{{ph}}" ng-model="unsetValue" name="name" />');
-        expect(inputElm).toBePristine();
-
-        $rootScope.ph = 1;
-        $rootScope.$digest();
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        $rootScope.ph = "";
-        $rootScope.$digest();
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-
-    it('should not dirty the model on an input event in response to a focus', inject(function($sniffer) {
-      if (msie) {
-        compileInput('<input type="text" placeholder="Test" ng-model="unsetValue" name="name" />');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test');
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusin');
-        browserTrigger(inputElm, 'focus');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test');
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-
-    it('should not dirty the model on an input event in response to a blur', inject(function($sniffer) {
-      if (msie) {
-        compileInput('<input type="text" placeholder="Test" ng-model="unsetValue" name="name" />');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm.attr('placeholder')).toBe('Test');
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusin');
-        browserTrigger(inputElm, 'focus');
-        browserTrigger(inputElm, 'input');
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusout');
-        browserTrigger(inputElm, 'input');
-        browserTrigger(inputElm, 'blur');
-        expect(inputElm).toBePristine();
-
-        changeInputValueTo('foo');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-
-    it('should dirty the model on an input event if there is a placeholder and value', inject(function($rootScope) {
-      if (msie) {
-        $rootScope.name = 'foo';
-        compileInput('<input type="text" placeholder="Test" ng-model="name" value="init" name="name" />');
-        expect(inputElm.val()).toBe($rootScope.name);
-        expect(inputElm).toBePristine();
+  it('should not dirty the model on an input event in response to a placeholder change', inject(function($sniffer) {
+    if (msie && $sniffer.hasEvent('input')) {
+      compileInput('<input type="text" ng-model="name" name="name" />');
+      inputElm.attr('placeholder', 'Test');
+      browserTrigger(inputElm, 'input');
 
-        changeInputValueTo('bar');
-        expect(inputElm).toBeDirty();
-      }
-    }));
+      expect(inputElm.attr('placeholder')).toBe('Test');
+      expect(inputElm).toBePristine();
 
-    it('should dirty the model on an input event if there is a placeholder and value after focusing', inject(function($rootScope) {
-      if (msie) {
-        $rootScope.name = 'foo';
-        compileInput('<input type="text" placeholder="Test" ng-model="name" value="init" name="name" />');
-        expect(inputElm.val()).toBe($rootScope.name);
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusin');
-        browserTrigger(inputElm, 'focus');
-        changeInputValueTo('bar');
-        expect(inputElm).toBeDirty();
-      }
-    }));
+      inputElm.attr('placeholder', 'Test Again');
+      browserTrigger(inputElm, 'input');
 
-    it('should dirty the model on an input event if there is a placeholder and value after bluring', inject(function($rootScope) {
-      if (msie) {
-        $rootScope.name = 'foo';
-        compileInput('<input type="text" placeholder="Test" ng-model="name" value="init" name="name" />');
-        expect(inputElm.val()).toBe($rootScope.name);
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusin');
-        browserTrigger(inputElm, 'focus');
-        expect(inputElm).toBePristine();
-
-        browserTrigger(inputElm, 'focusout');
-        browserTrigger(inputElm, 'blur');
-        changeInputValueTo('bar');
-        expect(inputElm).toBeDirty();
-      }
-    }));
-  });
+      expect(inputElm.attr('placeholder')).toBe('Test Again');
+      expect(inputElm).toBePristine();
+    }
+  }));
 
 
   it('should interpolate input names', function() {

test/ng/snifferSpec.js

@@ -64,10 +64,9 @@ describe('$sniffer', function() {
 
     it('should claim that IE9 doesn\'t have support for "oninput"', function() {
       // IE9 implementation is fubared, so it's better to pretend that it doesn't have the support
-      // IE10+ implementation is fubared when mixed with placeholders
       mockDivElement = {oninput: noop};
 
-      expect($sniffer.hasEvent('input')).toBe(!(msie && msie <= 11));
+      expect($sniffer.hasEvent('input')).toBe((msie == 9) ? false : true);
     });
   });