Changeset 14919

Timestamp:

05/26/2010 01:23:25 AM (16 years ago)

Author:

dd32

Message:

Revert back to spinner on bulk upgrades. See #11232

File:

• trunk/wp-admin/includes/class-wp-upgrader.php (modified) (4 diffs)

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

@@ -1093 +1093 @@
                 else
                         echo "<p>$string</p>\n";
-                $this->flush_output();
         }
 
@@ -1116 +1115 @@
                         $this->error = implode(', ', $messages);
                 }
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
         }
 
@@ -1128 +1128 @@
         function before($title = '') {
                 $this->in_loop = true;
-                printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . '</h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
-                echo '<div class="update-messages" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
+                printf( '<h4>' . $this->upgrader->strings['skin_before_update_header'] . ' <img alt="" src="' . admin_url( 'images/wpspin_light.gif' ) . '" class="hidden waiting-' . $this->upgrader->update_current . '" style="vertical-align:middle;"></h4>',  $title, $this->upgrader->update_current, $this->upgrader->update_count);
+                echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').show();</script>';
+                echo '<div class="update-messages hide-if-js" id="progress-' . esc_attr($this->upgrader->update_current) . '"><p>';
                 $this->flush_output();
         }
@@ -1144 +1145 @@
                 }
                 if ( !empty($this->result) && !is_wp_error($this->result) ) {
-                        echo '<div class="updated" id="finished-' . $this->upgrader->update_current . '"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
-
-                        if ( $this->upgrader->update_count > 1 ) // Only hide the update steps if multiple items are being updated.
-                                echo '<script type="text/javascript">jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
-                        else
-                                echo '<script type="text/javascript">jQuery(\'#finished-' . esc_js($this->upgrader->update_current) . '\ span\').toggle();</script>';
+                        echo '<div class="updated"><p>' . sprintf($this->upgrader->strings['skin_update_successful'], $title, 'jQuery(\'#progress-' . esc_js($this->upgrader->update_current) . '\').toggle();jQuery(\'span\', this).toggle(); return false;') . '</p></div>';
+                        echo '<script type="text/javascript">jQuery(\'.waiting-' . esc_js($this->upgrader->update_current) . '\').hide();</script>';
                 }