Changeset 24774

Timestamp:

07/23/2013 03:05:21 AM (11 years ago)

Author:

nacin

Message:

Autosave:

• Remove editor.js as a dependency for autosave.js, as it was in 3.5.
• Remove heartbeat.js as an implicit dependency.
• Abstract out the serialization of title/content/excerpt for comparisons.

props azaozz.
fixes #24756.

Location:

trunk/wp-includes

Files:

• js/autosave.js (modified) (17 diffs)
• script-loader.php (modified) (1 diff)

trunk/wp-includes/js/autosave.js

@@ -8 +8 @@
                 editor.onLoad.add( function() {
                     editor.save();
-                    autosaveLast = ( $('#title').val() || '' ) + ( $('#content').val() || '' );
+                    autosaveLast = wp.autosave.getCompareString();
                 });
             }
         });
     } else {
-        autosaveLast = ( $('#title').val() || '' ) + ( $('#content').val() || '' );
+        autosaveLast = wp.autosave.getCompareString();
     }
 
@@ -41 +41 @@
 
     window.onbeforeunload = function(){
-        var mce = typeof(tinymce) != 'undefined' ? tinymce.activeEditor : false, title, content;
-
-        if ( mce && !mce.isHidden() ) {
-            if ( mce.isDirty() )
+        var editor = typeof(tinymce) != 'undefined' ? tinymce.activeEditor : false, compareString;
+
+        if ( editor && ! editor.isHidden() ) {
+            if ( editor.isDirty() )
                 return autosaveL10n.saveAlert;
         } else {
             if ( fullscreen && fullscreen.settings.visible ) {
-                title = $('#wp-fullscreen-title').val() || '';
-                content = $("#wp_mce_fullscreen").val() || '';
+                compareString = wp.autosave.getCompareString({
+                    post_title: $('#wp-fullscreen-title').val() || '',
+                    content: $('#wp_mce_fullscreen').val() || '',
+                    excerpt: $('#excerpt').val() || ''
+                });
             } else {
-                title = $('#post #title').val() || '';
-                content = $('#post #content').val() || '';
-            }
-
-            if ( ( title || content ) && title + content != autosaveLast )
+                compareString = wp.autosave.getCompareString();
+            }
+
+            if ( compareString != autosaveLast )
                 return autosaveL10n.saveAlert;
         }
@@ -247 +249 @@
 function autosave_enable_buttons() {
     jQuery(document).trigger('autosave-enable-buttons');
-    if ( ! wp.heartbeat.hasConnectionError() ) {
+    if ( ! wp.heartbeat || ! wp.heartbeat.hasConnectionError() ) {
         // delay that a bit to avoid some rare collisions while the DOM is being updated.
         setTimeout(function(){
@@ -274 +276 @@
 autosave = function() {
     var post_data = wp.autosave.getPostData(),
-        doAutoSave = post_data.autosave,
+        compareString,
         successCallback;
 
     blockSave = true;
+
+    // post_data.content cannot be retrieved at the moment
+    if ( ! post_data.autosave )
+        return false;
 
     // No autosave while thickbox is open (media buttons)
     if ( jQuery("#TB_window").css('display') == 'block' )
-        doAutoSave = false;
+        return false;
+
+    compareString = wp.autosave.getCompareString( post_data );
 
     // Nothing to save or no change.
-    if ( ( post_data["post_title"].length == 0 && post_data["content"].length == 0 ) || post_data["post_title"] + post_data["content"] == autosaveLast ) {
-        doAutoSave = false;
-    }
-
-    if ( doAutoSave ) {
-        autosaveLast = post_data["post_title"] + post_data["content"];
-        jQuery(document).triggerHandler('wpcountwords', [ post_data["content"] ]);
-    } else {
+    if ( compareString == autosaveLast )
         return false;
-    }
+
+    autosaveLast = compareString;
+    jQuery(document).triggerHandler('wpcountwords', [ post_data["content"] ]);
 
     // Disable buttons until we know the save completed.
@@ -306 +309 @@
     jQuery.ajax({
         data: post_data,
-        beforeSend: doAutoSave ? autosave_loading : null,
+        beforeSend: autosave_loading,
         type: "POST",
         url: ajaxurl,
@@ -383 +386 @@
 
     return data;
-}
+};
+
+// Concatenate title, content and excerpt. Used to track changes when auto-saving.
+wp.autosave.getCompareString = function( post_data ) {
+    if ( typeof post_data === 'object' ) {
+        return ( post_data.post_title || '' ) + '::' + ( post_data.content || '' ) + '::' + ( post_data.excerpt || '' );
+    }
+
+    return ( $('#title').val() || '' ) + '::' + ( $('#content').val() || '' ) + '::' + ( $('#excerpt').val() || '' );
+};
 
 wp.autosave.local = {
 
-    lastsaveddata: '',
+    lastSavedData: '',
     blog_id: 0,
-    ajaxurl: window.ajaxurl || 'wp-admin/admin-ajax.php',
     hasStorage: false,
 
@@ -493 +504 @@
      */
     save: function( data ) {
-        var result = false;
+        var result = false, post_data, compareString;
 
         if ( ! data ) {
@@ -503 +514 @@
         }
 
-        // If the content and title did not change since the last save, don't save again
-        if ( post_data.post_title + ': ' + post_data.content == this.lastsaveddata )
+        // Cannot get the post data at the moment
+        if ( ! post_data.autosave )
             return false;
 
-        // Cannot get the post data at the moment
-        if ( !post_data.autosave )
+        compareString = wp.autosave.getCompareString( post_data );
+
+        // If the content, title and excerpt did not change since the last save, don't save again
+        if ( compareString == this.lastSavedData )
             return false;
 
@@ -516 +529 @@
 
         if ( result )
-            this.lastsaveddata = post_data.post_title + ': ' + post_data.content;
+            this.lastSavedData = compareString;
 
         return result;
@@ -525 +538 @@
         var self = this;
 
-        // Check if the browser supports sessionStorage and editor.js is loaded
-        if ( ! this.checkStorage() || typeof switchEditors == 'undefined' )
+        // Check if the browser supports sessionStorage and it's not disabled
+        if ( ! this.checkStorage() )
             return;
 
@@ -539 +552 @@
             this.blog_id = typeof window.autosaveL10n != 'undefined' ? window.autosaveL10n.blog_id : 0;
 
-        this.checkPost();
         $(document).ready( function(){ self.run(); } );
     },
@@ -545 +557 @@
     // Run on DOM ready
     run: function() {
-        var self = this, post_data;
-
-        // Set the comparison string
-        if ( !this.lastsaveddata ) {
-            post_data = wp.autosave.getPostData();
-
-            if ( post_data.content && $('#wp-content-wrap').hasClass('tmce-active') )
-                this.lastsaveddata = post_data.post_title + ': ' + switchEditors.pre_wpautop( post_data.content );
-            else
-                this.lastsaveddata = post_data.post_title + ': ' + post_data.content;
-        }
+        var self = this;
+
+        // Check if the local post data is different than the loaded post data.
+        this.checkPost();
 
         // Set the schedule
@@ -606 +611 @@
      */
     checkPost: function() {
-        var self = this, post_data = this.getData(), content, check_data, strip_tags = false, notice,
+        var self = this, post_data = this.getData(), content, post_title, excerpt, notice,
             post_id = $('#post_ID').val() || 0, cookie = wpCookies.get( 'wp-saving-post-' + post_id );
 
@@ -626 +631 @@
             return;
 
+        content = $('#content').val() || '';
+        post_title = $('#title').val() || '';
+        excerpt = $('#excerpt').val() || '';
+
+        if ( $('#wp-content-wrap').hasClass('tmce-active') && typeof switchEditors != 'undefined' )
+            content = switchEditors.pre_wpautop( content );
+
         // cookie == 'check' means the post was not saved properly, always show #local-storage-notice
-        if ( cookie != 'check' ) {
-            content = $('#content').val();
-            check_data = $.extend( {}, post_data );
-
-            if ( $('#wp-content-wrap').hasClass('tmce-active') )
-                content = switchEditors.pre_wpautop( content );
-
-            if ( this.compare( content, check_data.content ) && this.compare( $('#title').val(), check_data.post_title ) && this.compare( $('#excerpt').val(), check_data.excerpt ) )
-                return;
+        if ( cookie != 'check' && this.compare( content, post_data.content ) && this.compare( post_title, post_data.post_title ) && this.compare( excerpt, post_data.excerpt ) ) {
+            return;
         }
 
         this.restore_post_data = post_data;
-        this.undo_post_data = wp.autosave.getPostData();
+        this.undo_post_data = {
+            content: content,
+            post_title: post_title,
+            excerpt: excerpt
+        };
 
         notice = $('#local-storage-notice');
@@ -667 +676 @@
         if ( post_data ) {
             // Set the last saved data
-            this.lastsaveddata = post_data.post_title + ': ' + post_data.content;
+            this.lastSavedData = wp.autosave.getCompareString( post_data );
 
             if ( $('#title').val() != post_data.post_title )
@@ -675 +684 @@
             editor = typeof tinymce != 'undefined' && tinymce.get('content');
 
-            if ( editor && ! editor.isHidden() ) {
+            if ( editor && ! editor.isHidden() && typeof switchEditors != 'undefined' ) {
                 // Make sure there's an undo level in the editor
                 editor.undoManager.add();
@@ -690 +699 @@
         return false;
     }
-}
+};
 
 wp.autosave.local.init();

trunk/wp-includes/script-loader.php

@@ -104 +104 @@
     ) );
 
-    $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response', 'editor'), false, 1 );
+    $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), false, 1 );
 
     $scripts->add( 'heartbeat', "/wp-includes/js/heartbeat$suffix.js", array('jquery'), false, 1 );