From e7fd8db292736e7282162f4746c86423e4f15397 Mon Sep 17 00:00:00 2001
From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Thu, 26 Mar 2015 00:33:06 +0100
Subject: [PATCH] LivePreview: Let's not potentially mangle #wikiPreview

Sometimes you look at what you have written and realize it can be better...

Bug: T90490
Change-Id: If620e5c672e4632997028ddc9f802a82a83e6924
---
 .../mediawiki.action.edit.preview.js           | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 1878c89d9f..6f8e8afccb 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -9,12 +9,13 @@
 	 */
 	function doLivePreview( e ) {
 		var isDiff, api, request, postData, copySelectors, section,
-			$wikiPreview, $wikiDiff, $editform, $copyElements, $spinner;
+			$wikiPreview, $wikiDiff, $editform, $copyElements, $spinner, $errorBox;
 
 		isDiff = ( e.target.name === 'wpDiff' );
 		$wikiPreview = $( '#wikiPreview' );
 		$wikiDiff = $( '#wikiDiff' );
 		$editform = $( '#editform' );
+		$errorBox = $( '.errorbox' );
 		section = $editform.find( '[name="wpSection"]' ).val();
 
 		// Show changes for a new section is not yet supported
@@ -23,6 +24,8 @@
 		}
 		e.preventDefault();
 
+		// Remove any previously displayed errors
+		$errorBox.remove();
 		// Show #wikiPreview if it's hidden to be able to scroll to it
 		// (if it is hidden, it's also empty, so nothing changes in the rendering)
 		$wikiPreview.show();
@@ -227,13 +230,12 @@
 					errorMsg += result.textStatus;
 				}
 			}
-			$wikiPreview.children( '.mw-content-ltr,.mw-content-rtl' )
-				.empty()
-				.append( $( '<div>' )
-					.addClass( 'errorbox' )
-					.html( '<strong>' + mw.message( 'previewerrortext' ).escaped() + '</strong><br>' )
-					.append( document.createTextNode( errorMsg ) ) );
-			$wikiPreview.show();
+			$errorBox = $( '<div>' )
+				.addClass( 'errorbox' )
+				.html( '<strong>' + mw.message( 'previewerrortext' ).escaped() + '</strong><br>' )
+				.append( document.createTextNode( errorMsg ) );
+			$wikiDiff.hide();
+			$wikiPreview.hide().before( $errorBox );
 		} );
 	}
 
-- 
2.20.1