From e2cf367a95cba68b8c275bb83e0d810913e710dd Mon Sep 17 00:00:00 2001
From: David Lynch <dlynch@wikimedia.org>
Date: Tue, 2 Oct 2018 15:48:25 -0500
Subject: [PATCH] Make RDF attribute splits more robust

Split on regexp for whitespace instead of a single space. Avoids multiple-
spaces causing `'foo  bar'` to become `['foo', '', 'bar']`.

See also: I1f467f51017e2deae30905163bf5e6b07048cecf

Change-Id: Id7a887a20fac99715b79045f01e861b4efe9f2c7
---
 modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js | 2 +-
 modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js               | 2 +-
 modules/ve-mw/dm/nodes/ve.dm.MWGalleryCaptionNode.js           | 2 +-
 modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js             | 2 +-
 modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js              | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
index 532bfe9897..f2977c694b 100644
--- a/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
+++ b/modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js
@@ -39,7 +39,7 @@ ve.dm.MWExternalLinkAnnotation.static.toDataElement = function ( domElements, co
 	var dataElement, annotation,
 		domElement = domElements[ 0 ],
 		type = domElement.getAttribute( 'rel' ) || domElement.getAttribute( 'typeof' ) || domElement.getAttribute( 'property' ) || '',
-		types = type.split( ' ' );
+		types = type.trim().split( /\s+/ );
 
 	// If the link doesn't have a known RDFa type, auto-convert it to the correct type (internal/external/span)
 	if ( types.indexOf( 'mw:ExtLink' ) === -1 && types.indexOf( 'mw:WikiLink/Interwiki' ) === -1 ) {
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
index 6052f2f0e6..cc43bdf4ca 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js
@@ -76,7 +76,7 @@ ve.dm.MWBlockImageNode.static.toDataElement = function ( domElements, converter
 	img = imgWrapper.children[ 0 ]; // <img>, <video> or <audio>
 	captionNode = figure.children[ 1 ]; // <figcaption> or undefined
 	classAttr = figure.getAttribute( 'class' );
-	typeofAttrs = figure.getAttribute( 'typeof' ).split( ' ' );
+	typeofAttrs = figure.getAttribute( 'typeof' ).trim().split( /\s+/ );
 	mwDataJSON = figure.getAttribute( 'data-mw' );
 	mwData = mwDataJSON ? JSON.parse( mwDataJSON ) : {};
 	errorIndex = typeofAttrs.indexOf( 'mw:Error' );
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWGalleryCaptionNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWGalleryCaptionNode.js
index f680da2279..85989d681b 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWGalleryCaptionNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWGalleryCaptionNode.js
@@ -29,7 +29,7 @@ ve.dm.MWGalleryCaptionNode.static.matchTagNames = [ 'li' ];
 ve.dm.MWGalleryCaptionNode.static.matchFunction = function ( element ) {
 	var parentTypeof = ( element.parentNode && element.parentNode.getAttribute( 'typeof' ) ) || '';
 	return element.getAttribute( 'class' ) === 'gallerycaption' &&
-		parentTypeof.split( ' ' ).indexOf( 'mw:Extension/gallery' ) !== -1;
+		parentTypeof.trim().split( /\s+/ ).indexOf( 'mw:Extension/gallery' ) !== -1;
 };
 
 ve.dm.MWGalleryCaptionNode.static.parentNodeTypes = [ 'mwGallery' ];
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js
index 382ae6b71a..f2b7cccc65 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWGalleryImageNode.js
@@ -35,7 +35,7 @@ ve.dm.MWGalleryImageNode.static.childNodeTypes = [ 'mwGalleryImageCaption' ];
 ve.dm.MWGalleryImageNode.static.matchFunction = function ( element ) {
 	var parentTypeof = ( element.parentNode && element.parentNode.getAttribute( 'typeof' ) ) || '';
 	return element.getAttribute( 'class' ) === 'gallerybox' &&
-		parentTypeof.split( ' ' ).indexOf( 'mw:Extension/gallery' ) !== -1;
+		parentTypeof.trim().split( /\s+/ ).indexOf( 'mw:Extension/gallery' ) !== -1;
 };
 
 ve.dm.MWGalleryImageNode.static.parentNodeTypes = [ 'mwGallery' ];
diff --git a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
index fdbafe49c9..9e5e0c8583 100644
--- a/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
+++ b/modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js
@@ -55,7 +55,7 @@ ve.dm.MWInlineImageNode.static.toDataElement = function ( domElements, converter
 		figureInline = domElements[ 0 ],
 		imgWrapper = figureInline.children[ 0 ], // <a> or <span>
 		img = imgWrapper.children[ 0 ], // <img>, <video> or <audio>
-		typeofAttrs = ( figureInline.getAttribute( 'typeof' ) || '' ).split( ' ' ),
+		typeofAttrs = ( figureInline.getAttribute( 'typeof' ) || '' ).trim().split( /\s+/ ),
 		mwDataJSON = figureInline.getAttribute( 'data-mw' ),
 		mwData = mwDataJSON ? JSON.parse( mwDataJSON ) : {},
 		classes = figureInline.getAttribute( 'class' ),