Changeset 41797 for trunk/src/wp-admin/includes/class-theme-upgrader-skin.php

Timestamp:

10/09/2017 04:03:35 PM (9 years ago)

Author:

westonruter

Message:

Customize: Eliminate use of customize-loader in core so Customizer is opened consistently in top window.

• Open the door for future browser history feature in #28536, which is currently not feasible when customize-loader is used.
• Remove customizer-loader from being used on admin screens for Dashboard, Themes, non-shiny theme install/update.
• Keep the customize-loader functionality available for plugins, for the time being. It may become deprecated.
• Ensure return param in customizer links in Themes screen update to reflect search updated by pushState.
• Persist return when reloading Customizer due to theme switch, autosave restoration, or changeset trashing.
• Use location.replace() instead of changing location.href when trashing.
• Hide theme browser while Themes screen is loading when there is a search to prevent flash of unfiltered themes.
• Use throttling instead of debouncing when searching themes to ensure that screen is updated immediately on page load.
• Fix encoding and decoding of search param between URL and search field.
• Add support for dismissing autosaves when closing customize-loader, when it is used by plugins.
• Skip sending changeset UUID to customize-loader for population in browser location if changeset branching is not enabled.

See #28536.
Fixes #40254.

File:

• trunk/src/wp-admin/includes/class-theme-upgrader-skin.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-theme-upgrader-skin.php

@@ -50 +50 @@
                         $activate_link = wp_nonce_url( $activate_link, 'switch-theme_' . $stylesheet );
 
+                        $customize_url = add_query_arg(
+                                array(
+                                        'theme' => urlencode( $stylesheet ),
+                                        'return' => urlencode( admin_url( 'themes.php' ) ),
+                                ),
+                                admin_url( 'customize.php' )
+                        );
                         if ( get_stylesheet() == $stylesheet ) {
                                 if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-                                        $update_actions['preview']  = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
+                                        $update_actions['preview']  = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Customize' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Customize &#8220;%s&#8221;' ), $name ) . '</span></a>';
                                 }
                         } elseif ( current_user_can( 'switch_themes' ) ) {
                                 if ( current_user_can( 'edit_theme_options' ) && current_user_can( 'customize' ) ) {
-                                        $update_actions['preview'] = '<a href="' . wp_customize_url( $stylesheet ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
+                                        $update_actions['preview'] = '<a href="' . esc_url( $customize_url ) . '" class="hide-if-no-customize load-customize"><span aria-hidden="true">' . __( 'Live Preview' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Live Preview &#8220;%s&#8221;' ), $name ) . '</span></a>';
                                 }
                                 $update_actions['activate'] = '<a href="' . esc_url( $activate_link ) . '" class="activatelink"><span aria-hidden="true">' . __( 'Activate' ) . '</span><span class="screen-reader-text">' . sprintf( __( 'Activate &#8220;%s&#8221;' ), $name ) . '</span></a>';