test(tap): add some more tests for taps

Author: adamdbradley

js/ext/angular/test/service/ionicTap.unit.js

@@ -176,31 +176,55 @@ describe('Ionic Tap', function() {
     expect(c).toEqual({x:0, y: 0});
   });
 
-  it('Should not fire a tap for disabled elements', function() {
+  it('Should ignoreSimulateClick for disabled elements', function() {
     // Disabled elements should not be tapped
     var targetEle = document.createElement('input');
     targetEle.disabled = true;
-    var event = {};
-    ionic.tap.simulateClick(targetEle, event);
-    expect(event.tapIgnored).toEqual(true);
+    expect( ionic.tap.ignoreSimulateClick(targetEle) ).toEqual(true);
   });
 
-  it('Should not fire a tap for input[file] elements', function() {
+  it('Should ignoreSimulateClick for input[file] elements', function() {
     // Reported that on Android input[file] does not open using the tap
     var targetEle = document.createElement('input');
     targetEle.type = 'file';
-    var event = {};
-    ionic.tap.simulateClick(targetEle, event);
-    expect(event.tapIgnored).toEqual(true);
+    expect( ionic.tap.ignoreSimulateClick(targetEle) ).toEqual(true);
   });
 
-  it('Should not fire a tap for input[range] elements', function() {
+  it('Should ignoreSimulateClick for input[range] elements', function() {
     // Range and tap do not agree, probably because it doesn't have a delay to begin with
     var targetEle = document.createElement('input');
     targetEle.type = 'range';
-    var event = {};
-    ionic.tap.simulateClick(targetEle, event);
-    expect(event.tapIgnored).toEqual(true);
+    expect( ionic.tap.ignoreSimulateClick(targetEle) ).toEqual(true);
+  });
+
+  it('Should not ignoreSimulateClick for common inputs', function() {
+    var inputTypes = ['text', 'email', 'search', 'tel', 'number', 'date', 'month', 'password', null, undefined, ''];
+    for(var x=0; x<inputTypes.length; x++) {
+      var targetEle = document.createElement('input');
+      targetEle.type = inputTypes[x];
+      expect( ionic.tap.ignoreSimulateClick(targetEle) ).toEqual(false);
+    }
+    expect( ionic.tap.ignoreSimulateClick( document.createElement('div') ) ).toEqual(false);
+    expect( ionic.tap.ignoreSimulateClick( document.createElement('textarea') ) ).toEqual(false);
+    expect( ionic.tap.ignoreSimulateClick( document.createElement('select') ) ).toEqual(false);
+  });
+
+  it('Should correctly check for tap elements', function() {
+    expect(ionic.tap.isTapElement('A')).toEqual(true);
+    expect(ionic.tap.isTapElement('INPUT')).toEqual(true);
+    expect(ionic.tap.isTapElement('BUTTON')).toEqual(true);
+    expect(ionic.tap.isTapElement('LABEL')).toEqual(true);
+    expect(ionic.tap.isTapElement('TEXTAREA')).toEqual(true);
+    expect(ionic.tap.isTapElement('SELECT')).toEqual(true);
+
+    expect(ionic.tap.isTapElement('DIV')).toEqual(false);
+    expect(ionic.tap.isTapElement('SPAN')).toEqual(false);
+    expect(ionic.tap.isTapElement('I')).toEqual(false);
+    expect(ionic.tap.isTapElement('BODY')).toEqual(false);
+    expect(ionic.tap.isTapElement('SECTION')).toEqual(false);
+    expect(ionic.tap.isTapElement('ASIDE')).toEqual(false);
+    expect(ionic.tap.isTapElement('LI')).toEqual(false);
+    expect(ionic.tap.isTapElement('P')).toEqual(false);
   });
 
 });

js/utils/tap.js

@@ -34,7 +34,7 @@
         // only climb up a max of 5 parents, anything more probably isn't beneficial
         if(!ele) break;
 
-        if( ele.tagName.match(/a|input|button|label|textarea|select/i) ) {
+        if( ionic.tap.isTapElement(ele.tagName) ) {
           return ionic.tap.simulateClick(ele, e);
         }
         ele = ele.parentElement;
@@ -46,15 +46,21 @@
       ionic.tap.blurActive();
     },
 
+    isTapElement: function(tagName) {
+      return tagName == 'A' ||
+             tagName == 'INPUT' ||
+             tagName == 'BUTTON' ||
+             tagName == 'LABEL' ||
+             tagName == 'TEXTAREA' ||
+             tagName == 'SELECT';
+    },
+
     simulateClick: function(target, e) {
       // simulate a normal click by running the element's click method then focus on it
 
       var ele = target.control || target;
 
-      if(ele.disabled || ele.type === 'file' || ele.type === 'range') {
-        e.tapIgnored = true;
-        return;
-      }
+      if( ionic.tap.ignoreSimulateClick(ele) ) return;
 
       console.debug('simulateClick', e.type, ele.tagName, ele.className);
 
@@ -91,6 +97,10 @@
 
     },
 
+    ignoreSimulateClick: function(ele) {
+      return ele.disabled || ele.type === 'file' || ele.type === 'range';
+    },
+
     preventGhostClick: function(e) {
 
       console.debug((function(){