(/^(select|option)$/i).test(e.target.tagName) has been repeated 3 tim…

…es in the code so I thought it'd be better to export it in its own helper function isSelectOrOption(tagName)
ionic-team · Jul 29, 2015 · a017dfe · a017dfe
1 parent bab6cad
commit a017dfe
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/js/utils/tap.js b/js/utils/tap.js
@@ -353,7 +353,7 @@ function tapMouseDown(e) {
     console.log('mousedown', 'stop event');
     e.stopPropagation();
 
-    if ((!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) && !(/^(select|option)$/i).test(e.target.tagName)) {
+    if ((!ionic.tap.isTextInput(e.target) || tapLastTouchTarget !== e.target) && !isSelectOrOption(e.target.tagName)) {
       // If you preventDefault on a text input then you cannot move its text caret/cursor.
       // Allow through only the text input default. However, without preventDefault on an
       // input the 300ms delay can change focus on inputs after the keyboard shows up.
@@ -379,7 +379,7 @@ function tapMouseUp(e) {
     return false;
   }
 
-  if (tapIgnoreEvent(e) || (/^(select|option)$/i).test(e.target.tagName)) return false;
+  if (tapIgnoreEvent(e) || isSelectOrOption(e.target.tagName)) return false;
 
   if (!tapHasPointerMoved(e)) {
     tapClick(e);
@@ -434,7 +434,7 @@ function tapTouchEnd(e) {
   if (!tapHasPointerMoved(e)) {
     tapClick(e);
 
-    if ((/^(select|option)$/i).test(e.target.tagName)) {
+    if (isSelectOrOption(e.target.tagName)) {
       e.preventDefault();
     }
   }
@@ -593,6 +593,10 @@ function tapTargetElement(ele) {
   return ele;
 }
 
+function isSelectOrOption(tagName){
+  return (/^(select|option)$/i).test(tagName);
+}
+
 ionic.DomUtil.ready(function() {
   var ng = typeof angular !== 'undefined' ? angular : null;
   //do nothing for e2e tests