Switch from addLoadEvent to jQuery(document).ready. Fixes #6241 props…

… azaozz. git-svn-id: http://svn.automattic.com/wordpress/trunk@7325 1a063a9b-81f0-0310-95a4-ce76da25c4cd
WordPress · Mar 15, 2008 · e65d636 · e65d636
1 parent 04ae1fc
commit e65d636
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 41 deletions.
diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php
@@ -66,15 +66,7 @@
 ?>" />
 
 <?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 @@ function focusit() {
 </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
@@ -12,13 +12,6 @@
 <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 @@ function focusit() { // focus on first input field
 </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
@@ -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 @@ function focusit() { // focus on first input field
 </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
@@ -44,14 +44,6 @@
 	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 @@ function focusit() { // focus on first input field
 </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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -47,7 +47,7 @@ function check_pass_strength ( ) {
 		$('.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
@@ -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;