From f2a9ccd5bdf8a892801df937dc25ed19a9fe4aec Mon Sep 17 00:00:00 2001
From: Ed Sanders <esanders@wikimedia.org>
Date: Wed, 21 Nov 2018 18:47:19 +0000
Subject: [PATCH] Avoid HTML string parsing

Identified using https://github.com/wikimedia/eslint-plugin-jquery/pull/12

Change-Id: I138e018fdc037d688e055eacddfdc5bfc2cc5abe
---
 modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js             | 2 +-
 modules/ve-mw/init/ve.init.mw.ArticleTarget.js              | 6 +++---
 .../contextitems/ve.ui.MWLanguageVariantNodeContextItem.js  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
index 8b25bbff22..6311b31fd4 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWExtensionNode.js
@@ -77,7 +77,7 @@ ve.ce.MWExtensionNode.prototype.generateContents = function ( config ) {
 			.fail( this.onParseError.bind( this, deferred ) );
 		return deferred.promise( { abort: xhr.abort } );
 	} else {
-		deferred.resolve( $( '<span>&nbsp;</span>' ).get() );
+		deferred.resolve( $( '<span>' ).text( '\u00a0' ).get() );
 		return deferred.promise();
 	}
 };
diff --git a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
index 1f53fb4922..e180678bb1 100644
--- a/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
+++ b/modules/ve-mw/init/ve.init.mw.ArticleTarget.js
@@ -2644,7 +2644,7 @@ ve.init.mw.ArticleTarget.prototype.renderCategories = function ( categoryItems )
 		} ) );
 	} );
 	return $.when.apply( $, promises ).then( function () {
-		var $output = $( '<div class="catlinks" />' );
+		var $output = $( '<div>' ).addClass( 'catlinks' );
 		function renderPageLink( page ) {
 			var title = mw.Title.newFromText( page.category || page );
 			return $( '<a>' ).attr( 'rel', 'mw:WikiLink' ).attr( 'href', title.getUrl() ).text( title.getMainText() );
@@ -2661,7 +2661,7 @@ ve.init.mw.ArticleTarget.prototype.renderCategories = function ( categoryItems )
 		}
 		if ( categories.normal.length ) {
 			categories.normal.sort( categorySort );
-			$normal = $( '<div class="mw-normal-catlinks" />' );
+			$normal = $( '<div>' ).addClass( 'mw-normal-catlinks' );
 			$normal.append(
 				renderPageLink( ve.msg( 'pagecategorieslink' ) ).text( ve.msg( 'pagecategories', categories.normal.length ) ),
 				ve.msg( 'colon-separator' ),
@@ -2671,7 +2671,7 @@ ve.init.mw.ArticleTarget.prototype.renderCategories = function ( categoryItems )
 		}
 		if ( categories.hidden.length ) {
 			categories.hidden.sort( categorySort );
-			$hidden = $( '<div class="mw-hidden-catlinks" />' );
+			$hidden = $( '<div>' ).addClass( 'mw-hidden-catlinks' );
 			if ( mw.user.options.get( 'showhiddencats' ) ) {
 				$hidden.addClass( 'mw-hidden-cats-user-shown' );
 			} else if ( mw.config.get( 'wgNamespaceIds' ).category === mw.config.get( 'wgNamespaceNumber' ) ) {
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js b/modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js
index a6add68343..82a024d7e6 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWLanguageVariantNodeContextItem.js
@@ -63,7 +63,7 @@ ve.ui.MWLanguageVariantNodeContextItem.prototype.setup = function () {
 ve.ui.MWLanguageVariantNodeContextItem.prototype.renderBody = function () {
 	var $body = this.$body,
 		$table = $( '<table>' ),
-		$header = $( '<tr> ' ),
+		$header = $( '<tr>' ),
 		variantInfo = this.model.getVariantInfo(),
 		type = this.model.getRuleType(),
 		isHidden = this.model.isHidden(),