From: Bartosz Dziewoński <matma.rex@gmail.com>
Date: Tue, 22 Dec 2015 19:59:25 +0000 (+0100)
Subject: mw.Upload.BookletLayout: Avoid serializing DOM to HTML and parsing it right back
X-Git-Tag: 1.31.0-rc.0~8323
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/?a=commitdiff_plain;h=fca748275ae086b2f6eb4f888900db834a489e63;p=lhc%2Fweb%2Fwiklou.git

mw.Upload.BookletLayout: Avoid serializing DOM to HTML and parsing it right back

More changes like in 430c5bb852f735397699d90c4cc583439669d675,
slightly less trivial, that I missed the first time.

Change-Id: Ie818055aba82153d7a931b453c4d75eb30085f69
---

diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 48060973bc..6813ea65eb 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -131,11 +131,11 @@
 			notOwnWorkLocal = mw.message( 'foreign-structured-upload-form-label-not-own-work-local-default' );
 		}
 
-		$ownWorkMessage = $( '<p>' ).html( ownWorkMessage.parse() )
+		$ownWorkMessage = $( '<p>' ).append( ownWorkMessage.parseDom() )
 			.addClass( 'mw-foreignStructuredUpload-bookletLayout-license' );
 		$notOwnWorkMessage = $( '<div>' ).append(
-			$( '<p>' ).html( notOwnWorkMessage.parse() ),
-			$( '<p>' ).html( notOwnWorkLocal.parse() )
+			$( '<p>' ).append( notOwnWorkMessage.parseDom() ),
+			$( '<p>' ).append( notOwnWorkLocal.parseDom() )
 		);
 		$ownWorkMessage.add( $notOwnWorkMessage ).find( 'a' )
 			.attr( 'target', '_blank' )
diff --git a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
index 1cd9101511..84b33fdc50 100644
--- a/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.Upload.BookletLayout.js
@@ -290,10 +290,8 @@
 			if ( error.info === 'TitleBlacklist prevents this title from being created' ) {
 				// HACK Apparently the only reliable way to determine whether TitleBlacklist was involved
 				return new OO.ui.Error(
-					$( '<p>' ).html(
-						// HACK TitleBlacklist doesn't have a sensible message, this one is from UploadWizard
-						mw.message( 'api-error-blacklisted' ).parse()
-					),
+					// HACK TitleBlacklist doesn't have a sensible message, this one is from UploadWizard
+					$( '<p>' ).msg( 'api-error-blacklisted' ),
 					{ recoverable: false }
 				);
 			}
@@ -303,9 +301,7 @@
 				message = mw.message( 'api-error-unknownerror', JSON.stringify( stateDetails ) );
 			}
 			return new OO.ui.Error(
-				$( '<p>' ).html(
-					message.parse()
-				),
+				$( '<p>' ).append( message.parseDom() ),
 				{ recoverable: false }
 			);
 		}
@@ -358,10 +354,8 @@
 				);
 			} else {
 				return new OO.ui.Error(
-					$( '<p>' ).html(
-						// Let's get all the help we can if we can't pin point the error
-						mw.message( 'api-error-unknown-warning', JSON.stringify( stateDetails ) ).parse()
-					),
+					// Let's get all the help we can if we can't pin point the error
+					$( '<p>' ).msg( 'api-error-unknown-warning', JSON.stringify( stateDetails ) ),
 					{ recoverable: false }
 				);
 			}