Changeset 27280

Timestamp:

02/26/2014 06:54:26 AM (11 years ago)

Author:

nacin

Message:

Decrement update count bubbles as plugins/themes are updated, live.

props gcorne, mitchoyoshitaka.
fixes #17703.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader-skins.php (modified) (7 diffs)
• wp-admin/includes/class-wp-upgrader.php (modified) (3 diffs)
• wp-admin/js/updates.js (added)
• wp-admin/plugins.php (modified) (1 diff)
• wp-admin/update-core.php (modified) (1 diff)
• wp-admin/update.php (modified) (4 diffs)
• wp-includes/script-loader.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-upgrader-skins.php

@@ -93 +93 @@
     function after() {}
 
+    /**
+     * Output JavaScript that calls function to decrement the update counts.
+     *
+     * @since 3.9.0
+     */
+    protected function decrement_update_count( $type ) {
+        if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+            return;
+        }
+        echo '<script type="text/javascript">
+                (function( wp ) {
+                    if ( wp && wp.updates.decrementCount ) {
+                        wp.updates.decrementCount( "' . $type . '" );
+                    }
+                })( window.wp );
+            </script>';
+    }
 }
 
@@ -124 +141 @@
             echo '<iframe style="border:0;overflow:hidden" width="100%" height="170px" src="' . wp_nonce_url('update.php?action=activate-plugin&networkwide=' . $this->plugin_network_active . '&plugin=' . urlencode( $this->plugin ), 'activate-plugin_' . $this->plugin) .'"></iframe>';
         }
+
+        $this->decrement_update_count( 'plugin' );
 
         $update_actions =  array(
@@ -253 +272 @@
         flush();
     }
+
+    /**
+     * Output JavaScript that sends message to parent window to decrement the update counts.
+     *
+     * @since 3.9.0
+     */
+    protected function decrement_update_count( $type ) {
+        if ( ! $this->result || is_wp_error( $this->result ) || 'up_to_date' === $this->result ) {
+            return;
+        }
+        echo '<script type="text/javascript">
+                if ( window.postMessage && JSON ) {
+                    window.parent.postMessage( JSON.stringify( { action: "decrementUpdateCount", upgradeType: "' . $type . '" } ), window.location.protocol + "//" + window.location.hostname );
+                }
+            </script>';
+    }
 }
 
@@ -273 +308 @@
     function after($title = '') {
         parent::after($this->plugin_info['Title']);
+        $this->decrement_update_count( 'plugin' );
     }
     function bulk_footer() {
@@ -307 +343 @@
     function after($title = '') {
         parent::after( $this->theme_info->display('Name') );
+        $this->decrement_update_count( 'theme' );
     }
 
@@ -480 +517 @@
 
     function after() {
+        $this->decrement_update_count( 'theme' );
 
         $update_actions = array();
@@ -562 +600 @@
 
     function bulk_footer() {
+        $this->decrement_update_count( 'translation' );
         $update_actions = array();
         $update_actions['updates_page'] = '<a href="' . self_admin_url( 'update-core.php' ) . '" title="' . esc_attr__( 'Go to WordPress Updates page' ) . '" target="_parent">' . __( 'Return to WordPress Updates' ) . '</a>';

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

@@ -561 +561 @@
 
             if ( !isset( $current->response[ $plugin ] ) ) {
-                $this->skin->set_result(true);
+                $this->skin->set_result('up_to_date');
                 $this->skin->before();
                 $this->skin->feedback('up_to_date');
@@ -864 +864 @@
             $this->skin->before();
             $this->skin->set_result(false);
-            $this->skin->error('up_to_date');
+            $this->skin->error( 'up_to_date' );
             $this->skin->after();
             return false;
@@ -949 +949 @@
                 $this->skin->set_result(true);
                 $this->skin->before();
-                $this->skin->feedback('up_to_date');
+                $this->skin->feedback( 'up_to_date' );
                 $this->skin->after();
                 $results[$theme] = true;

trunk/src/wp-admin/plugins.php

@@ -114 +114 @@
             $parent_file = 'plugins.php';
 
+            wp_enqueue_script( 'updates' );
             require_once(ABSPATH . 'wp-admin/admin-header.php');
 

trunk/src/wp-admin/update-core.php

@@ -12 +12 @@
 wp_enqueue_style( 'plugin-install' );
 wp_enqueue_script( 'plugin-install' );
+wp_enqueue_script( 'updates' );
 add_thickbox();
 

trunk/src/wp-admin/update.php

@@ -38 +38 @@
         $nonce = 'bulk-update-plugins';
 
-        wp_enqueue_script('jquery');
+        wp_enqueue_script( 'updates' );
         iframe_header();
 
@@ -55 +55 @@
         $parent_file = 'plugins.php';
         $submenu_file = 'plugins.php';
+
+        wp_enqueue_script( 'updates' );
         require_once(ABSPATH . 'wp-admin/admin-header.php');
 
@@ -155 +157 @@
 
         wp_enqueue_script( 'customize-loader' );
+        wp_enqueue_script( 'updates' );
 
         $title = __('Update Theme');
@@ -186 +189 @@
         $nonce = 'bulk-update-themes';
 
-        wp_enqueue_script('jquery');
+        wp_enqueue_script( 'updates' );
         iframe_header();
 

trunk/src/wp-includes/script-loader.php

@@ -482 +482 @@
         ) );
 
+        $scripts->add( 'updates', "/wp-admin/js/updates$suffix.js", array( 'jquery' ) );
+
         $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' );