Changeset 16000

Timestamp:

10/27/2010 06:57:10 AM (14 years ago)

Author:

westi

Message:

Remove the ghetto code and use the script loader properly on the login page.
Ensure that we actually have convertEntities available on the login page.
Introduce a login_footer action.
Hook in the script loader to the login_header and login_footer actions.
See #5919, #15124.

Location:

trunk

Files:

• wp-includes/default-filters.php (modified) (1 diff)
• wp-includes/script-loader.php (modified) (2 diffs)
• wp-login.php (modified) (3 diffs)

trunk/wp-includes/default-filters.php

@@ -211 +211 @@
 add_action( 'wp_head',             'wp_shortlink_wp_head',          10, 0 );
 add_action( 'template_redirect',   'wp_shortlink_header',           11, 0 );
+
+// Login actions
+add_action( 'login_head',          'wp_enqueue_scripts',            1     );
+add_action( 'login_head',          'wp_print_head_scripts',         9     );
+add_action( 'login_footer',        'wp_print_footer_scripts'              );
 
 // Feed Generator Tags

trunk/wp-includes/script-loader.php

@@ -240 +240 @@
     $scripts->add_data( 'imgareaselect', 'group', 1 );
 
+    $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
+    $scripts->add_data( 'password-strength-meter', 'group', 1 );
+    $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
+        'empty' => __('Strength indicator'),
+        'short' => __('Very weak'),
+        'bad' => __('Weak'),
+        /* translators: password strength */
+        'good' => _x('Medium', 'password strength'),
+        'strong' => __('Strong'),
+        'mismatch' => __('Mismatch'),
+        'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
+    ) );
+
+    $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
+    $scripts->add_data( 'user-profile', 'group', 1 );   
+    
     if ( is_admin() ) {
         $scripts->add( 'ajaxcat', "/wp-admin/js/cat$suffix.js", array( 'wp-lists' ), '20090102' );
@@ -262 +278 @@
         $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' );
         $scripts->add_data( 'admin-custom-fields', 'group', 1 );
-
-        $scripts->add( 'password-strength-meter', "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
-        $scripts->add_data( 'password-strength-meter', 'group', 1 );
-        $scripts->localize( 'password-strength-meter', 'pwsL10n', array(
-            'empty' => __('Strength indicator'),
-            'short' => __('Very weak'),
-            'bad' => __('Weak'),
-            /* translators: password strength */
-            'good' => _x('Medium', 'password strength'),
-            'strong' => __('Strong'),
-            'mismatch' => __('Mismatch'),
-            'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
-        ) );
-
-        $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
-        $scripts->add_data( 'user-profile', 'group', 1 );
 
         $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20100818' );

trunk/wp-login.php

@@ -135 +135 @@
 ?>
 <p id="backtoblog"><a href="<?php bloginfo('url'); ?>/" title="<?php _e('Are you lost?') ?>"><?php printf(__('&larr; Back to %s'), get_bloginfo('title', 'display' )); ?></a></p>
-
+<?php do_action('login_footer'); ?>
 </body>
 </html>
@@ -335 +335 @@
 }
 
-// TODO: Eliminate duplicated code from wp_default_scripts()
-function load_password_strength_meter() {
-    if ( !$guessurl = site_url() )
-        $guessurl = wp_guess_url();
-
-    $suffix = defined('SCRIPT_DEBUG') && SCRIPT_DEBUG ? '.dev' : '';
-
-    wp_enqueue_script( 'user-profile', $guessurl . "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20100925' );
-    wp_enqueue_script( 'password-strength-meter', $guessurl . "/wp-admin/js/password-strength-meter$suffix.js", array('jquery'), '20101027' );
-    wp_localize_script( 'password-strength-meter', 'pwsL10n', array(
-        'empty' => __('Strength indicator'),
-        'short' => __('Very weak'),
-        'bad' => __('Weak'),
-        /* translators: password strength */
-        'good' => _x('Medium', 'password strength'),
-        'strong' => __('Strong'),
-        'mismatch' => __('Mismatch'),
-        'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};'
-    ) );
-
-    wp_print_scripts( array('user-profile') );
-}
-
 //
 // Main
@@ -469 +446 @@
     }
 
+    wp_enqueue_script('utils');
+    wp_enqueue_script('user-profile');
+
     login_header(__('Reset Password'), '<p class="message reset-pass">' . __('Enter your new password below.') . '</p>', $errors );
-
-    load_password_strength_meter();
 
 ?>