From 30cdc1018080f59397de4eabbb4b69115748b1ba Mon Sep 17 00:00:00 2001
From: Andrew Ozz <azaozz@git.wordpress.org>
Date: Sat, 5 Apr 2014 01:28:35 +0000
Subject: [PATCH] When autosaving a new post for the first time after a title
 was typed, cancel the autosave if the user is submitting the form. (Includes
 a precommit fix for customize-controls.css.) Props Nessworthy, davidmarichal,
 fixes #27657

git-svn-id: https://develop.svn.wordpress.org/trunk@27951 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/css/customize-controls.css |  1 +
 src/wp-admin/js/post.js                 | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/wp-admin/css/customize-controls.css b/src/wp-admin/css/customize-controls.css
index 9a95eb1a8f..400bef846f 100644
--- a/src/wp-admin/css/customize-controls.css
+++ b/src/wp-admin/css/customize-controls.css
@@ -536,6 +536,7 @@ body {
 	position: absolute;
 	top: 0; left: 0; bottom: 0; right: 0;
 	border: 4px solid #2ea2cc;
+	-webkit-border-radius: 2px;
 	border-radius: 2px;
 }
 #customize-control-header_image .header-view.button.selected {
diff --git a/src/wp-admin/js/post.js b/src/wp-admin/js/post.js
index 0e3e824957..65acf918d7 100644
--- a/src/wp-admin/js/post.js
+++ b/src/wp-admin/js/post.js
@@ -504,13 +504,22 @@ jQuery(document).ready( function($) {
 	// Autosave new posts after a title is typed
 	if ( $( '#auto_draft' ).val() ) {
 		$( '#title' ).blur( function() {
+			var cancel;
+
 			if ( ! this.value || $('#edit-slug-box > *').length ) {
 				return;
 			}
 
-			if ( wp.autosave ) {
-				wp.autosave.server.triggerSave();
-			}
+			// Cancel the autosave when the blur was triggered by the user submitting the form
+			$('form#post').one( 'submit', function() {
+				cancel = true;
+			});
+
+			window.setTimeout( function() {
+				if ( ! cancel && wp.autosave ) {
+					wp.autosave.server.triggerSave();
+				}
+			}, 200 );
 		});
 	}