Changeset 12817

Timestamp:

01/24/2010 06:16:17 AM (13 years ago)

Author:

markjaquith

Message:

Shake the JS weight away!

Location:

trunk

Files:

• wp-includes/js/jquery/ui.effects.js (deleted)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-login.php (modified) (6 diffs)

trunk/wp-includes/script-loader.php

@@ -143 +143 @@
     $scripts->add( 'jquery-ui-dialog', '/wp-includes/js/jquery/ui.dialog.js', array('jquery-ui-resizable', 'jquery-ui-draggable'), '1.7.1' );
     $scripts->add_data( 'jquery-ui-dialog', 'group', 1 );
-
-    $scripts->add( 'jquery-ui-effects', '/wp-includes/js/jquery/ui.effects.js', array('jquery-ui-core'), '1.7.2' ); // Yes, this one is 1.7.2 — the others need to be updated
-    $scripts->add_data( 'jquery-ui-effects', 'group', 1 );
 
     // deprecated, not used in core, most functionality is included in jQuery 1.3

trunk/wp-login.php

@@ -46 +46 @@
     add_action( 'login_head', 'noindex' );
 
-    // Print scripts
-    add_action( 'login_head', 'wp_print_scripts' );
-
     if ( empty($wp_error) )
         $wp_error = new WP_Error();
@@ -56 +53 @@
     $shake_error_codes = apply_filters( 'shake_error_codes', $shake_error_codes );
 
-    if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) ) {
-        wp_enqueue_script( 'jquery-ui-effects' );
+    if ( $shake_error_codes && $wp_error->get_error_code() && in_array( $wp_error->get_error_code(), $shake_error_codes ) )
         add_action( 'login_head', 'wp_shake_js', 12 );
-    }
 
     ?>
@@ -121 +116 @@
     }
 } // End of login_header()
-
 function wp_shake_js() {
 ?>
 <script type="text/javascript">
-jQuery( document ).ready(function(){
-    jQuery( '#h1' ).focus();
-    jQuery( '#loginform, #registerform, #lostpasswordform' ).effect('shake', {times: 3}, 40, function(){try{wp_attempt_focus();} catch(e){}});
-});
+addLoadEvent = function(func){if(typeof jQuery!="undefined")jQuery(document).ready(func);else if(typeof wpOnload!='function'){wpOnload=func;}else{var oldonload=wpOnload;wpOnload=function(){oldonload();func();}}};
+function s(id,pos){g(id).left=pos+'px';}
+function g(id){return document.getElementById(id).style;}
+function shake(id,a,d){c=a.shift();s(id,c);if(a.length>0){setTimeout(function(){shake(id,a,d);},d);}else{try{wp_attempt_focus();}catch(e){}}}
+addLoadEvent(function(){ var p=new Array(15,30,15,0,-15,-30,-15,0);p=p.concat(p.concat(p));var i=document.forms[0].id;g(i).position='relative';shake(i,p,20);});
 </script>
 <?php
@@ -411 +406 @@
 <script type="text/javascript">
 try{document.getElementById('user_login').focus();}catch(e){}
+if(typeof wpOnload=='function')wpOnload();
 </script>
 </body>
@@ -486 +482 @@
 <script type="text/javascript">
 try{document.getElementById('user_login').focus();}catch(e){}
+if(typeof wpOnload=='function')wpOnload();
 </script>
 </body>
@@ -629 +626 @@
 wp_attempt_focus();
 <?php } ?>
+if(typeof wpOnload=='function')wpOnload();
 </script>
 </body>