Add checking for touchscreens

woocommerce · Aug 29, 2017 · 6b47531 · 6b47531
1 parent 2cbfbcc
commit 6b47531
Show file tree

Hide file tree

Showing 10 changed files with 64 additions and 9 deletions.
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -772,6 +772,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -5466,7 +5474,10 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.focusOnActiveElement = function () {
-    this.$results.find('li.select2-results__option--highlighted').focus();
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
   };
 
   Select2.prototype._syncAttributes = function () {

diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js
diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -772,6 +772,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -5466,7 +5474,10 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.focusOnActiveElement = function () {
-    this.$results.find('li.select2-results__option--highlighted').focus();
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
   };
 
   Select2.prototype._syncAttributes = function () {

diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/dist/js/selectWoo.full.js b/dist/js/selectWoo.full.js
@@ -772,6 +772,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -5466,7 +5474,10 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.focusOnActiveElement = function () {
-    this.$results.find('li.select2-results__option--highlighted').focus();
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
   };
 
   Select2.prototype._syncAttributes = function () {

diff --git a/dist/js/selectWoo.full.min.js b/dist/js/selectWoo.full.min.js
diff --git a/dist/js/selectWoo.js b/dist/js/selectWoo.js
@@ -772,6 +772,14 @@ S2.define('select2/utils',[
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });
 
@@ -5466,7 +5474,10 @@ S2.define('select2/core',[
   };
 
   Select2.prototype.focusOnActiveElement = function () {
-    this.$results.find('li.select2-results__option--highlighted').focus();
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
   };
 
   Select2.prototype._syncAttributes = function () {

diff --git a/dist/js/selectWoo.min.js b/dist/js/selectWoo.min.js
diff --git a/src/js/select2/core.js b/src/js/select2/core.js
@@ -379,7 +379,10 @@ define([
   };
 
   Select2.prototype.focusOnActiveElement = function () {
-    this.$results.find('li.select2-results__option--highlighted').focus();
+    // Don't mess with the focus on touchscreens because it causes havoc with on-screen keyboards.
+    if (! Utils.isTouchscreen()) {
+      this.$results.find('li.select2-results__option--highlighted').focus();
+    }
   };
 
   Select2.prototype._syncAttributes = function () {

diff --git a/src/js/select2/utils.js b/src/js/select2/utils.js
@@ -272,5 +272,13 @@ define([
     $element.append($nodes);
   };
 
+  // Determine whether the browser is on a touchscreen device.
+  Utils.isTouchscreen = function() {
+    if ('undefined' === typeof Utils._isTouchscreenCache) {
+      Utils._isTouchscreenCache = 'ontouchstart' in document.documentElement;
+    }
+    return Utils._isTouchscreenCache;
+  }
+
   return Utils;
 });