WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@804 7be80a69-a1ef-0310-a953-fb0f7c49ff36

2 files changed, 4 insertions, 7 deletions

diff --git a/wp-includes/js/autosave.js.php b/wp-includes/js/autosave.js.php
index a8648f0..c360318 100644
--- a/wp-includes/js/autosave.js.php
+++ b/wp-includes/js/autosave.js.php
@@ -2,15 +2,11 @@
 cache_javascript_headers();
 ?>
 var autosaveLast = '';
-function autosave_timer() {
-	autosave();
-	setTimeout("autosave_timer()", <?php echo apply_filters('autosave_interval', '60000') ?>);
-}
-
+var autosavePeriodical;
 function autosave_start_timer() {
 	var form = $('post');
 	autosaveLast = form.post_title.value+form.content.value;
-	setTimeout("autosave_timer()", <?php echo apply_filters('autosave_start_delay', '60000') ?>);
+	autosavePeriodical = new PeriodicalExecuter(autosave, <?php echo apply_filters('autosave_interval', '60'); ?>);
 }
 addLoadEvent(autosave_start_timer)
 
@@ -80,6 +76,7 @@ function autosave() {
 	if ( typeof tinyMCE == "undefined" || tinyMCE.configs.length < 1 || rich == false ) {
 		autosaveAjax.setVar("content", form.content.value);
 	} else {
+		// Don't run while the TinyMCE spellcheck is on.
 		if(tinyMCE.selectedInstance.spellcheckerOn) return;
 		tinyMCE.wpTriggerSave();
 		autosaveAjax.setVar("content", form.content.value);
diff --git a/wp-includes/js/list-manipulation-js.php b/wp-includes/js/list-manipulation-js.php
index a6aa5ee..6c89d5f 100644
--- a/wp-includes/js/list-manipulation-js.php
+++ b/wp-includes/js/list-manipulation-js.php
@@ -52,7 +52,7 @@ Object.extend(listMan.prototype, {
 						tempObj.showLink = id;
 				});
 			}
-			ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php echo wp_specialchars(__('Jump to new item'), 1); ?></a></p></div>" ) : '');
+			ajaxAdd.myResponseElement.update(tempObj.showLink ? ( "<div id='jumplink' class='updated fade'><p><a href='#" + what + '-' + tempObj.showLink + "'><?php _e('Jump to new item'); ?></a></p></div>" ) : '');
 			if ( tempObj.addComplete && typeof tempObj.addComplete == 'function' )
 				tempObj.addComplete( what, where, update, transport );
 			tempObj.recolorList();