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

Merge "Port ve.init.mw.Target to ve.fixBase()"

Browse source
This commit is contained in:
jenkins-bot 2015-04-28 20:21:12 +00:00 committed by Gerrit Code Review
parent 9b6a3bb823 a332ea210a
commit 76aa7c8ad6
1 changed files with 16 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -267,25 +267,20 @@ ve.init.mw.Target.static.integrationType = 'page';
/* Static Methods */ /* Static Methods */
/** /**
* Take a target document with a possibly relative base URL, and modify it to be absolute. * Fix the base URL from Parsoid if necessary.
* The base URL of the target document is resolved using the base URL of the source document. *
* @param {HTMLDocument} targetDoc Document whose base URL should be resolved * Absolutizes the base URL if it's relative, and sets a base URL based on wgArticlePath
* @param {HTMLDocument} sourceDoc Document whose base URL should be used for resolution * if there was no base URL at all.
*
* @param {HTMLDocument} doc Parsoid document
*/ */
ve.init.mw.Target.static.fixBase = function ( targetDoc, sourceDoc ) { ve.init.mw.Target.static.fixBase = function ( doc ) {
var baseNode; ve.fixBase( doc, document, ve.resolveUrl(
if ( !targetDoc.baseURI ) { // Don't replace $1 with the page name, because that'll break if
baseNode = targetDoc.getElementsByTagName( 'base' )[0]; // the page name contains a slash
if ( baseNode ) { mw.config.get( 'wgArticlePath' ).replace( '$1', '' ),
// Modify the existing <base> tag document
baseNode.setAttribute( 'href', ve.resolveUrl( baseNode.getAttribute( 'href' ), sourceDoc ) ); ) );
} else {
// No <base> tag, add one
baseNode = targetDoc.createElement( 'base' );
baseNode.setAttribute( 'href', sourceDoc.baseURI );
sourceDoc.head.appendChild( baseNode );
}
}
}; };
/** /**
@ -301,7 +296,7 @@ ve.init.mw.Target.static.fixBase = function ( targetDoc, sourceDoc ) {
* @fires loadError * @fires loadError
*/ */
ve.init.mw.Target.onLoad = function ( response ) { ve.init.mw.Target.onLoad = function ( response ) {
var i, len, linkData, aboutDoc, docRevIdMatches, baseNode, var i, len, linkData, aboutDoc, docRevIdMatches,
docRevId = 0, docRevId = 0,
data = response ? response.visualeditor : null; data = response ? response.visualeditor : null;
@ -314,27 +309,8 @@ ve.init.mw.Target.onLoad = function ( response ) {
this.originalHtml = data.content; this.originalHtml = data.content;
this.doc = ve.parseXhtml( this.originalHtml ); this.doc = ve.parseXhtml( this.originalHtml );
// Parsoid outputs a protocol-relative <base> tag, so absolutize it // Fix relative or missing base URL if needed
this.constructor.static.fixBase( this.doc, document ); this.constructor.static.fixBase( this.doc );
// If the document has an invalid <base> tag or no <base> tag at all (new pages,
// for example, don't have a <base> tag) then set a base URI based on wgArticlePath.
if ( !this.doc.baseURI ) {
// Use existing <base> tag if present
baseNode = this.doc.getElementsByName( 'base' )[0] || this.doc.createElement( 'base' );
baseNode.setAttribute( 'href',
ve.resolveUrl(
// Don't replace $1 with this.pageName, because that'll break if
// this.pageName contains a slash
mw.config.get( 'wgArticlePath' ).replace( '$1', '' ),
document
)
);
// If baseNode was created by us, attach it
if ( !baseNode.parentNode ) {
this.doc.head.appendChild( baseNode );
}
}
this.remoteNotices = ve.getObjectValues( data.notices ); this.remoteNotices = ve.getObjectValues( data.notices );
this.protectedClasses = data.protectedClasses; this.protectedClasses = data.protectedClasses;