Ticket #7392: 7392-6.patch

wp-includes/js/autosave.js

@@ -1 +1 @@
 var autosave, autosaveLast = '', autosavePeriodical, autosaveDelayPreview = false, notSaved = true, blockSave = false, fullscreen, autosaveLockRelease = true;
 
-jQuery(document).ready( function($) {
+if ( jQuery('#wp-content-wrap').hasClass('tmce-active') ) {
+        jQuery(document).on( '_tinymce-body-onload.autosave', function( e, editor ) {
+                if ( 'content' === editor.id && ! editor.isHidden() ) {
+                        setTimeout( function(){
+                                editor.save();
+                                autosaveLast = wp.autosave.getCompareString();
 
-        if ( $('#wp-content-wrap').hasClass('tmce-active') && typeof tinymce != 'undefined' ) {
-                tinymce.onAddEditor.add( function( tinymce, editor ) {
-                        if ( 'content' == editor.id ) {
-                                editor.onLoad.add( function() {
-                                        editor.save();
-                                        if ( typeof switchEditors != 'undefined' ) {
-                                                autosaveLast = wp.autosave.getCompareString({
-                                                        post_title : $('#title').val() || '',
-                                                        content : switchEditors.pre_wpautop( $('#content').val() ) || '',
-                                                        excerpt : $('#excerpt').val() || '',
-                                                });
-                                        } else {
-                                                autosaveLast = wp.autosave.getCompareString();
-                                        }
-                                });
-                        }
-                });
-        } else {
-                autosaveLast = wp.autosave.getCompareString();
-        }
+                                // temp debug
+                                if ( 'console' in window )
+                                        console.log( 'autosave will run = %s', autosaveLast !== wp.autosave.getCompareString() );
+                        }, 1000 );
+                }
+        });
+}
 
+jQuery(document).ready( function($) {
+        autosaveLast = wp.autosave.getCompareString();
         autosavePeriodical = $.schedule({time: autosaveL10n.autosaveInterval * 1000, func: function() { autosave(); }, repeat: true, protect: true});
 
         //Disable autosave after the form has been submitted

wp-includes/js/tinymce/plugins/wordpress/editor_plugin_src.js

@@ -236 +236 @@
                                         o.content = switchEditors.pre_wpautop(o.content);
                         });
 
+                        ed.onLoad.add( function(ed) {
+                                if ( typeof jQuery === 'function' )
+                                        jQuery(document).trigger( '_tinymce-body-onload', [ ed ] );
+                        });
+
                         /* disable for now
                         ed.onBeforeSetContent.add(function(ed, o) {
                                 o.content = t._setEmbed(o.content);