Changeset 4101

Timestamp:

08/16/2006 02:50:03 AM (20 years ago)

Author:

ryan

Message:

Autosave focus grab fix from masquerade. fixes #3040

Location:

trunk/wp-includes

Files:

• js/autosave.js.php (modified) (1 diff)
• js/tinymce/plugins/wordpress/editor_plugin.js (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/autosave.js.php

@@ -84 +84 @@
                 autosaveAjax.setVar("content", form.content.value);
         } else {
+                if(tinyMCE.selectedInstance.spellcheckerOn) return;
                 tinyMCE.wpTriggerSave();
                 autosaveAjax.setVar("content", form.content.value);

trunk/wp-includes/js/tinymce/plugins/wordpress/editor_plugin.js

@@ -425 +425 @@
 
         tinyMCE._customCleanup(this, "submit_content_dom", this.contentWindow.document.body);
-        var htm = skip_cleanup ? this.getBody().innerHTML : tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true);
+        tinyMCE.selectedInstance.getWin().oldfocus=tinyMCE.selectedInstance.getWin().focus;
+        tinyMCE.selectedInstance.getWin().focus=function() {};
+        var htm = tinyMCE._cleanupHTML(this, this.getDoc(), this.settings, this.getBody(), tinyMCE.visualAid, true, true);
+        tinyMCE.selectedInstance.getWin().focus=tinyMCE.selectedInstance.getWin().oldfocus;
         htm = tinyMCE._customCleanup(this, "submit_content", htm);
 

trunk/wp-includes/script-loader.php

@@ -16 +16 @@
                 $this->add( 'quicktags', '/wp-includes/js/quicktags.js', false, '3517' );
                 $this->add( 'colorpicker', '/wp-includes/js/colorpicker.js', false, '3517' );
-                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '08112006' );
+                $this->add( 'tiny_mce', '/wp-includes/js/tinymce/tiny_mce_gzip.php', false, '08152006' );
                 $this->add( 'wp_tiny_mce', '/wp-includes/js/tinymce/tiny_mce_config.php', array('tiny_mce'), '04162006' );
                 $this->add( 'prototype', '/wp-includes/js/prototype.js', false, '1.5.0');
-                $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4096');
+                $this->add( 'autosave', '/wp-includes/js/autosave.js.php', array('prototype', 'sack'), '4101');
                 if ( is_admin() ) {
                         $this->add( 'dbx-admin-key', '/wp-admin/dbx-admin-key-js.php', array('dbx'), '3651' );