From 2d7ba950bc402a5953f2ae862580dddfdbb388f2 Mon Sep 17 00:00:00 2001
From: Peter Westwood <westi@git.wordpress.org>
Date: Sat, 15 Mar 2008 22:57:47 +0000
Subject: [PATCH] Switch from addLoadEvent to jQuery(document).ready. Fixes
 #6241 props azaozz.

git-svn-id: https://develop.svn.wordpress.org/trunk@7325 602fd350-edb4-49c9-b593-d223f7449a82
---
 wp-admin/edit-form-advanced.php     | 16 +++++++---------
 wp-admin/edit-form-comment.php      | 11 ++++-------
 wp-admin/edit-form.php              | 12 +++---------
 wp-admin/edit-page-form.php         | 12 ++++--------
 wp-admin/js/comment.js              |  2 +-
 wp-admin/js/common.js               |  2 +-
 wp-admin/js/link.js                 |  2 +-
 wp-admin/js/page.js                 |  2 +-
 wp-admin/js/post.js                 |  2 +-
 wp-admin/js/upload.js               |  2 +-
 wp-admin/user-edit.php              |  2 +-
 wp-includes/js/thickbox/thickbox.js |  2 +-
 12 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
index 2b1c27c802..4f6e786691 100644
--- a/wp-admin/edit-form-advanced.php
+++ b/wp-admin/edit-form-advanced.php
@@ -66,15 +66,7 @@ else
 ?>" />
 
 <?php echo $form_extra ?>
-<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
-<script type="text/javascript">
-function focusit() {
-	// focus on first input field
-	document.post.title.focus();
-}
-addLoadEvent(focusit);
-</script>
-<?php endif; ?>
+
 <div id="poststuff">
 
 <div class="submitbox" id="submitpost">
@@ -352,3 +344,9 @@ if ( $authors && count( $authors ) > 1 ) :
 </div>
 
 </form>
+
+<?php if ((isset($post->post_title) && '' == $post->post_title) || (isset($_GET['message']) && 2 > $_GET['message'])) : ?>
+<script type="text/javascript">
+try{document.post.title.focus();}catch(e){}
+</script>
+<?php endif; ?>
diff --git a/wp-admin/edit-form-comment.php b/wp-admin/edit-form-comment.php
index 0b4341c1ff..95c38417db 100644
--- a/wp-admin/edit-form-comment.php
+++ b/wp-admin/edit-form-comment.php
@@ -12,13 +12,6 @@ $form_extra = "' />\n<input type='hidden' name='comment_ID' value='" . $comment-
 <input type="hidden" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" name="action" value='<?php echo $form_action . $form_extra ?>' />
 
-<script type="text/javascript">
-function focusit() { // focus on first input field
-	document.post.name.focus();
-}
-addLoadEvent(focusit);
-</script>
-
 <div id="poststuff">
 
 <div class="submitbox" id="submitcomment">
@@ -108,3 +101,7 @@ echo "<a href='" . wp_nonce_url("comment.php?action=deletecomment&amp;c=$comment
 </div>
 
 </form>
+
+<script type="text/javascript">
+try{document.post.name.focus();}catch(e){}
+</script>
diff --git a/wp-admin/edit-form.php b/wp-admin/edit-form.php
index d0713e951d..18997e4dfa 100644
--- a/wp-admin/edit-form.php
+++ b/wp-admin/edit-form.php
@@ -9,15 +9,6 @@
 <input type="hidden" id="user-id" name="user_ID" value="<?php echo (int) $user_ID ?>" />
 <input type="hidden" name="action" value='post' />
 
-<script type="text/javascript">
-<!--
-function focusit() { // focus on first input field
-	document.getElementById('title').focus();
-}
-addLoadEvent(focusit);
-//-->
-</script>
-
 <div id="poststuff">
     <fieldset id="titlediv">
       <legend><a href="http://wordpress.org/docs/reference/post/#title" title="<?php _e('Help on titles') ?>"><?php _e('Title') ?></a></legend>
@@ -72,4 +63,7 @@ edCanvas = document.getElementById('content');
 </div>
 </form>
 
+<script type="text/javascript">
+try{document.getElementById('title').focus();}catch(e){}
+</script>
 </div>
diff --git a/wp-admin/edit-page-form.php b/wp-admin/edit-page-form.php
index a6177b4c35..72f67c3811 100644
--- a/wp-admin/edit-page-form.php
+++ b/wp-admin/edit-page-form.php
@@ -44,14 +44,6 @@ else
 	echo clean_url(stripslashes(wp_get_referer()));
 ?>" />
 
-<script type="text/javascript">
-// <![CDATA[
-function focusit() { // focus on first input field
-	document.post.title.focus();
-}
-addLoadEvent(focusit);
-// ]]>
-</script>
 <div id="poststuff">
 
 <div class="submitbox" id="submitpage">
@@ -281,3 +273,7 @@ if ( $authors && count( $authors ) > 1 ) :
 </div>
 
 </form>
+
+<script type="text/javascript">
+try{document.post.title.focus();}catch(e){}
+</script>
diff --git a/wp-admin/js/comment.js b/wp-admin/js/comment.js
index bde9b97fee..ddb54a5ee5 100644
--- a/wp-admin/js/comment.js
+++ b/wp-admin/js/comment.js
@@ -1,4 +1,4 @@
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	add_postbox_toggles('comment');
 
 	jQuery('.edit-timestamp').click(function () {
diff --git a/wp-admin/js/common.js b/wp-admin/js/common.js
index 0c2a9f27ab..08c132a591 100644
--- a/wp-admin/js/common.js
+++ b/wp-admin/js/common.js
@@ -1,4 +1,4 @@
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	// pulse
 	jQuery('.fade').animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300).animate( { backgroundColor: '#ffffe0' }, 300).animate( { backgroundColor: '#fffbcc' }, 300);
 
diff --git a/wp-admin/js/link.js b/wp-admin/js/link.js
index 9f5a28dc2c..cfc0f94902 100644
--- a/wp-admin/js/link.js
+++ b/wp-admin/js/link.js
@@ -1,4 +1,4 @@
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	jQuery('#link_name').focus();
 	// postboxes
 	add_postbox_toggles('link');
diff --git a/wp-admin/js/page.js b/wp-admin/js/page.js
index 02fd70858b..8fe10fd0b1 100644
--- a/wp-admin/js/page.js
+++ b/wp-admin/js/page.js
@@ -1,4 +1,4 @@
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	add_postbox_toggles('page');
 	make_slugedit_clickable();
 
diff --git a/wp-admin/js/post.js b/wp-admin/js/post.js
index 9aeafcc19d..b5b272c9da 100644
--- a/wp-admin/js/post.js
+++ b/wp-admin/js/post.js
@@ -58,7 +58,7 @@ function tag_press_key( e ) {
 	}
 }
 
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	// postboxes
 	add_postbox_toggles('post');
 
diff --git a/wp-admin/js/upload.js b/wp-admin/js/upload.js
index b632e427ce..f60f11380b 100644
--- a/wp-admin/js/upload.js
+++ b/wp-admin/js/upload.js
@@ -1,4 +1,4 @@
-addLoadEvent( function() {
+jQuery(document).ready( function() {
 	theFileList = {
 		currentImage: {ID: 0},
 		nonce: '',
diff --git a/wp-admin/user-edit.php b/wp-admin/user-edit.php
index 0b29819e10..9c298dda30 100644
--- a/wp-admin/user-edit.php
+++ b/wp-admin/user-edit.php
@@ -47,7 +47,7 @@ function profile_js ( ) {
 		$('.color-palette').click(function(){$(this).siblings('input[name=admin_color]').attr('checked', 'checked')});
 	} );
 	
-	addLoadEvent( function() {
+	jQuery(document).ready( function() {
 		jQuery('#pass1,#pass2').attr('autocomplete','off');
     });
 </script>
diff --git a/wp-includes/js/thickbox/thickbox.js b/wp-includes/js/thickbox/thickbox.js
index f31d779aac..5770c8b0a4 100644
--- a/wp-includes/js/thickbox/thickbox.js
+++ b/wp-includes/js/thickbox/thickbox.js
@@ -11,7 +11,7 @@ var tb_closeImage = "../wp-includes/js/thickbox/tb-close.png";
 /*!!!!!!!!!!!!!!!!! edit below this line at your own risk !!!!!!!!!!!!!!!!!!!!!!!*/
 
 //on page load call tb_init
-addLoadEvent(function(){   
+jQuery(document).ready(function(){   
 	tb_init('a.thickbox, area.thickbox, input.thickbox');//pass where to apply thickbox
 	imgLoader = new Image();// preload image
 	imgLoader.src = tb_pathToImage;