Changeset 31914

Timestamp:

03/27/2015 10:53:50 PM (10 years ago)

Author:

ocean90

Message:

Theme Switcher: Opening themes details modal shouldn't require two clicks on touch devices.

Inspired by [26838].

see #31794.

File:

• trunk/src/wp-admin/js/customize-controls.js (modified) (2 diffs)

trunk/src/wp-admin/js/customize-controls.js

@@ -1848 +1848 @@
     api.ThemeControl = api.Control.extend({
 
+        touchDrag: false,
+
         /**
          * @since 4.2.0
@@ -1854 +1856 @@
             var control = this;
 
+            control.container.on( 'touchmove', '.theme', function() {
+                control.touchDrag = true;
+            });
+
             // Bind details view trigger.
-            control.container.on( 'click keydown', '.theme', function( event ) {
+            control.container.on( 'click keydown touchend', '.theme', function( event ) {
                 if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
                     return;
                 }
 
-                if ( 'button' === event.target.className ) {
+                // Bail if the user scrolled on a touch device.
+                if ( control.touchDrag === true ) {
+                    return control.touchDrag = false;
+                }
+
+                // Prevent the modal from showing when the user clicks the action button.
+                if ( $( event.target ).is( '.theme-actions .button' ) ) {
                     return;
                 }