Autosave:

- Move the 'Saving post' and 'Draft saved at...' strings from autosaveL10n to postL10n as they are used only there.
- Use the custom jQuery events 'before-autosave' and 'after-autosave' to show these messages.
- Separate autosave.suspend() for local and server so local autosaves can continue while server autosaves are suspended.
- Remove the recently added autosave.server.disable() and use autosave.server.suspend() instead.
- Bring back .button.disabled, button-primary.disabled and use .disabled to prevent multiple form submissions.
See #25272.


git-svn-id: https://develop.svn.wordpress.org/trunk@27038 602fd350-edb4-49c9-b593-d223f7449a82

src/wp-includes/css/buttons.css

@@ -165,8 +165,10 @@ TABLE OF CONTENTS:
 
 .wp-core-ui .button[disabled],
 .wp-core-ui .button:disabled,
+.wp-core-ui .button.disabled,
 .wp-core-ui .button-secondary[disabled],
 .wp-core-ui .button-secondary:disabled,
+.wp-core-ui .button-secondary.disabled,
 .wp-core-ui .button-disabled {
 	color: #aaa !important;
 	border-color: #ddd !important;
@@ -221,7 +223,8 @@ TABLE OF CONTENTS:
 
 .wp-core-ui .button-primary[disabled],
 .wp-core-ui .button-primary:disabled,
-.wp-core-ui .button-primary-disabled {
+.wp-core-ui .button-primary-disabled,
+.wp-core-ui .button-primary.disabled {
 	color: #94cde7 !important;
 	background: #298cba !important;
 	border-color: #1b607f !important;

src/wp-includes/js/autosave.js

@@ -6,7 +6,6 @@ window.autosave = function(){};
 	function autosave() {
 		var initialCompareString,
 		lastTriggerSave = 0,
-		isSuspended = false,
 		$document = $(document);
 
 		/**
@@ -87,18 +86,11 @@ window.autosave = function(){};
 			$document.trigger( 'autosave-enable-buttons' );
 		}
 
-		function suspend() {
-			isSuspended = true;
-		}
-
-		function resume() {
-			isSuspended = false;
-		}
-
 		// Autosave in localStorage
 		function autosaveLocal() {
 			var restorePostData, undoPostData, blog_id, post_id, hasStorage, intervalTimer,
-				lastCompareString;
+				lastCompareString,
+				isSuspended = false;
 
 			// Check if the browser supports sessionStorage and it's not disabled
 			function checkStorage() {
@@ -196,6 +188,14 @@ window.autosave = function(){};
 				return setStorage( stored );
 			}
 
+			function suspend() {
+				isSuspended = true;
+			}
+
+			function resume() {
+				isSuspended = false;
+			}
+
 			/**
 			 * Save post data for the current post
 			 *
@@ -415,14 +415,17 @@ window.autosave = function(){};
 			return {
 				hasStorage: hasStorage,
 				getSavedPostData: getSavedPostData,
-				save: save
+				save: save,
+				suspend: suspend,
+				resume: resume
 			};
 		}
 
 		// Autosave on the server
 		function autosaveServer() {
-			var _disabled, _blockSave, _blockSaveTimer, previousCompareString, lastCompareString,
-				nextRun = 0;
+			var _blockSave, _blockSaveTimer, previousCompareString, lastCompareString,
+				nextRun = 0,
+				isSuspended = false;
 
 			// Block saving for the next 10 sec.
 			function tempBlockSave() {
@@ -434,6 +437,14 @@ window.autosave = function(){};
 				}, 10000 );
 			}
 
+			function suspend() {
+				isSuspended = true;
+			}
+
+			function resume() {
+				isSuspended = false;
+			}
+
 			// Runs on heartbeat-response
 			function response( data ) {
 				_schedule();
@@ -442,7 +453,6 @@ window.autosave = function(){};
 				previousCompareString = '';
 
 				$document.trigger( 'after-autosave', [data] );
-				$( '.autosave-message' ).text( data.message );
 				enableButtons();
 
 				if ( data.success ) {
@@ -451,15 +461,6 @@ window.autosave = function(){};
 				}
 			}
 
-			/**
-			 * Disable autosave
-			 *
-			 * Intended to run on form.submit
-			 */
-			function disable() {
-				_disabled = true;
-			}
-
 			/**
 			 * Save immediately
 			 *
@@ -488,7 +489,7 @@ window.autosave = function(){};
 			function save() {
 				var postData, compareString;
 
-				if ( isSuspended || _disabled || _blockSave ) {
+				if ( isSuspended || _blockSave ) {
 					return false;
 				}
 
@@ -516,7 +517,6 @@ window.autosave = function(){};
 				$document.trigger( 'wpcountwords', [ postData.content ] )
 					.trigger( 'before-autosave', [ postData ] );
 
-				$( '.autosave-message' ).text( autosaveL10n.savingText );
 				postData._wpnonce = $( '#_wpnonce' ).val() || '';
 
 				return postData;
@@ -556,10 +556,11 @@ window.autosave = function(){};
 			});
 
 			return {
-				disable: disable,
 				tempBlockSave: tempBlockSave,
 				triggerSave: triggerSave,
-				postChanged: postChanged
+				postChanged: postChanged,
+				suspend: suspend,
+				resume: resume
 			};
 		}
 
@@ -584,8 +585,6 @@ window.autosave = function(){};
 			getCompareString: getCompareString,
 			disableButtons: disableButtons,
 			enableButtons: enableButtons,
-			suspend: suspend,
-			resume: resume,
 			local: autosaveLocal(),
 			server: autosaveServer()
 		};

src/wp-includes/script-loader.php

@@ -430,6 +430,8 @@ function wp_default_scripts( &$scripts ) {
 			'privatelyPublished' => __('Privately Published'),
 			'published' => __('Published'),
 			'comma' => _x( ',', 'tag delimiter' ),
+			'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
+			'savingText' => __('Saving Draft…'),
 		) );
 
 		$scripts->add( 'link', "/wp-admin/js/link$suffix.js", array( 'wp-lists', 'postbox' ), false, 1 );
@@ -653,8 +655,6 @@ function wp_just_in_time_script_localization() {
 
 	wp_localize_script( 'autosave', 'autosaveL10n', array(
 		'autosaveInterval' => AUTOSAVE_INTERVAL,
-		'savingText' => __('Saving Draft…'),
-		'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'),
 		'blog_id' => get_current_blog_id(),
 	) );