wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 06:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Move restbaseId stripping to ve.utils.parsoid"

Browse source
This commit is contained in:
jenkins-bot 2020-06-12 18:49:17 +00:00 committed by Gerrit Code Review
parent 310b4d6e4c 877d1e3359
commit 1bc368e01d
5 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/init/ve.init.mw.Platform.js
View file

@ -61,7 +61,7 @@ ve.init.mw.Platform.prototype.notify = function ( message, title, options ) {
* @inheritdoc
*/
ve.init.mw.Platform.prototype.getMetadataIdRegExp = function () {
return /^mw[a-zA-Z0-9\-_]{2,6}$/;
return mw.libs.ve.restbaseIdRegExp;
};
/** @inheritdoc */

9
modules/ve-mw/preinit/ve.init.mw.DiffLoader.js
View file

@ -35,17 +35,10 @@
// This method is only called after actually loading these, see `parseDocumentModulePromise`
// eslint-disable-next-line no-undef
targetClass = ve.init.mw.ArticleTarget,
// eslint-disable-next-line no-undef
metadataIdRegExp = ve.init.platform.getMetadataIdRegExp(),
data = response ? ( response.visualeditor || response.visualeditoredit ) : null;
if ( data && typeof data.content === 'string' ) {
doc = targetClass.static.parseDocument( data.content, 'visual', section, section !== null );
// Strip RESTBase IDs
Array.prototype.forEach.call( doc.querySelectorAll( '[id^="mw"]' ), function ( element ) {
if ( element.id.match( metadataIdRegExp ) ) {
element.removeAttribute( 'id' );
}
} );
mw.libs.ve.stripRestbaseIds( doc );
return targetClass.static.createModelFromDom( doc, 'visual' );
}
return null;

11
modules/ve-mw/preinit/ve.utils.parsoid.js
View file

@ -82,6 +82,17 @@ mw.libs.ve.stripParsoidFallbackIds = function ( element ) {
} );
};
mw.libs.ve.restbaseIdRegExp = /^mw[a-zA-Z0-9\-_]{2,6}$/;
mw.libs.ve.stripRestbaseIds = function ( doc ) {
var restbaseIdRegExp = mw.libs.ve.restbaseIdRegExp;
Array.prototype.forEach.call( doc.querySelectorAll( '[id^="mw"]' ), function ( element ) {
if ( element.id.match( restbaseIdRegExp ) ) {
element.removeAttribute( 'id' );
}
} );
};
/**
* Fix fragment links which should be relative to the current document
*

2
modules/ve-mw/tests/dm/ve.dm.mwExample.js
View file

@ -673,7 +673,7 @@ ve.dm.mwExample.domToDataCases = {
fromDataBody: '<b>a</b><b data-parsoid="1">bx</b><b data-parsoid="2">c</b> ' +
'<b>dd</b>'
},
'adjacent annotations (Parsoid IDs)': {
'adjacent annotations (RESTBase IDs)': {
preserveAnnotationDomElements: true,
body: '<b>a</b><b id="mwAB">b</b><b id="mwCD">c</b> ' +
'<b>d</b><b>d</b>',

9
modules/ve-mw/ui/datatransferhandlers/ve.ui.MWWikitextStringTransferHandler.js
View file

@ -107,7 +107,7 @@ ve.ui.MWWikitextStringTransferHandler.prototype.process = function () {
// Don't immediately chain, as this.parsoidRequest must be abortable
this.parsoidRequest.then( function ( response ) {
var htmlDoc, doc, surface, elementsWithIds, len;
var htmlDoc, doc, surface;
if ( ve.getProp( response, 'visualeditor', 'result' ) !== 'success' ) {
return failure();
@ -116,12 +116,7 @@ ve.ui.MWWikitextStringTransferHandler.prototype.process = function () {
htmlDoc = ve.createDocumentFromHtml( response.visualeditor.content );
// Strip RESTBase IDs
elementsWithIds = htmlDoc.querySelectorAll( '[id]' );
for ( i = 0, len = elementsWithIds.length; i < len; i++ ) {
if ( elementsWithIds[ i ].getAttribute( 'id' ).match( ve.init.platform.getMetadataIdRegExp() ) ) {
elementsWithIds[ i ].removeAttribute( 'id' );
}
}
mw.libs.ve.stripRestbaseIds( htmlDoc );
// Strip legacy IDs, for example in section headings
mw.libs.ve.stripParsoidFallbackIds( htmlDoc.body );