Changeset 37681

Timestamp:

06/10/2016 10:38:57 PM (8 years ago)

Author:

afercia

Message:

Plugin Install: fix edge-case where the tab=upload page can be accessed directly.

The ?tab=upload page still exists for no-js support and for users who may
access it directly (e.g. from bookmarks or history) or plugins doing the same.
In this page, the "Browse plugins" link should always behave like a link.

Fixes #35429.

File:

• trunk/src/wp-admin/js/plugin-install.js (modified) (3 diffs)

trunk/src/wp-admin/js/plugin-install.js

@@ -12 +12 @@
         $tabbables,
         $firstTabbable,
-        $lastTabbable;
+        $lastTabbable,
+        uploadViewToggle = $( '.upload-view-toggle' ),
+        $body = $( document.body );
 
     tb_position = function() {
@@ -54 +56 @@
      * modal gets removed from the DOM.
      */
-    $( 'body' )
+    $body
         .on( 'thickbox:iframe:loaded', tbWindow, function() {
             iframeLoaded();
@@ -181 +183 @@
      * When a user presses the "Upload Plugin" button, show the upload form in place
      * rather than sending them to the devoted upload plugin page.
-     * @todo consider to abstract this in a generic, reusable, utility, see theme.js
+     * The `?tab=upload` page still exists for no-js support and for plugins that
+     * might access it directly (?). When we're in this page, let the link behave
+     * like a link. Otherwise we're in the normal plugin installer pages and the
+     * link should behave like a toggle button.
      */
-    var uploadViewToggle = $( '.upload-view-toggle' ),
-        $body = $( document.body );
-
-    uploadViewToggle
-        .attr({
-            role: 'button',
-            'aria-expanded': 'false'
-        })
-        .on( 'click', function( event ) {
-            event.preventDefault();
-            $body.toggleClass( 'show-upload-view' );
-            uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
-        });
+    if ( ! uploadViewToggle.hasClass( 'upload-tab' ) ) {
+        uploadViewToggle
+            .attr({
+                role: 'button',
+                'aria-expanded': 'false'
+            })
+            .on( 'click', function( event ) {
+                event.preventDefault();
+                $body.toggleClass( 'show-upload-view' );
+                uploadViewToggle.attr( 'aria-expanded', $body.hasClass( 'show-upload-view' ) );
+            });
+    }
 });