Changeset 16000 for trunk/wp-includes/script-loader.php

Timestamp:

10/27/2010 06:57:10 AM (10 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.

File:

• trunk/wp-includes/script-loader.php (modified) (2 diffs)

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' );