Editor: Prevent switching editor tabs from marking content as dirty

Automattic · Jul 18, 2016 · 6c1fe8c · 6c1fe8c
1 parent c080cfd
commit 6c1fe8c
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 1 deletion.
diff --git a/client/lib/posts/post-edit-store.js b/client/lib/posts/post-edit-store.js
@@ -471,7 +471,23 @@ PostEditStore = {
 	},
 
 	isDirty: function() {
-		return _post !== _savedPost || _rawContent !== _initialRawContent;
+		debug(
+			'isDirty post?%s rawContent?%s initial=%s content=%s',
+			_post !== _savedPost,
+			_rawContent !== _initialRawContent,
+			_initialRawContent,
+			_rawContent
+		);
+		if ( _post !== _savedPost ) {
+			return true;
+		}
+		if ( _rawContent !== _initialRawContent ) {
+			return (
+				! isContentEmpty( _rawContent ) ||
+				! isContentEmpty( _initialRawContent )
+			);
+		}
+		return false;
 	},
 
 	isNew: function() {

diff --git a/client/lib/posts/test/post-edit-store.js b/client/lib/posts/test/post-edit-store.js
@@ -570,6 +570,56 @@ describe( 'post-edit-store', function() {
 
 			assert( PostEditStore.isDirty() );
 		} );
+
+		it( 'returns false if content changes from empty to <p><br></p>', function() {
+			dispatcherCallback( {
+				action: {
+					type: 'RECEIVE_POST_TO_EDIT',
+					post: {}
+				}
+			} );
+
+			dispatcherCallback( {
+				action: {
+					type: 'EDIT_POST_RAW_CONTENT',
+					content: ''
+				}
+			} );
+
+			dispatcherCallback( {
+				action: {
+					type: 'EDIT_POST_RAW_CONTENT',
+					content: '<p><br data-mce-bogus="1"></p>'
+				}
+			} );
+
+			assert( ! PostEditStore.isDirty() );
+		} );
+
+		it( 'returns false if content changes from <p><br></p> to empty', function() {
+			dispatcherCallback( {
+				action: {
+					type: 'RECEIVE_POST_TO_EDIT',
+					post: {}
+				}
+			} );
+
+			dispatcherCallback( {
+				action: {
+					type: 'EDIT_POST_RAW_CONTENT',
+					content: '<p><br data-mce-bogus="1"></p>'
+				}
+			} );
+
+			dispatcherCallback( {
+				action: {
+					type: 'EDIT_POST_RAW_CONTENT',
+					content: ''
+				}
+			} );
+
+			assert( ! PostEditStore.isDirty() );
+		} );
 	} );
 
 	describe( '#isSaveBlocked()', function() {