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

Merge "Fix href parsing in transclusion nodes when on alternative (e.g. mobile) domains/paths"

Browse source
This commit is contained in:
jenkins-bot 2014-12-06 21:41:13 +00:00 committed by Gerrit Code Review
parent ee954cbdd5 a7b9b89479
commit 9d1b8fdded
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js
View file

@ -102,7 +102,7 @@ ve.ce.MWTransclusionNode.prototype.onParseSuccess = function ( deferred, respons
return this.onParseError.call( this, deferred ); return this.onParseError.call( this, deferred );
} }
contentNodes = $.parseHTML( response.visualeditor.content ); contentNodes = $.parseHTML( response.visualeditor.content, this.getModelHtmlDocument() );
// HACK: if $content consists of a single paragraph, unwrap it. // HACK: if $content consists of a single paragraph, unwrap it.
// We have to do this because the PHP parser wraps everything in <p>s, and inline templates // We have to do this because the PHP parser wraps everything in <p>s, and inline templates
// will render strangely when wrapped in <p>s. // will render strangely when wrapped in <p>s.
@ -129,12 +129,13 @@ ve.ce.MWTransclusionNode.prototype.onParseSuccess = function ( deferred, respons
* @inheritdoc * @inheritdoc
*/ */
ve.ce.MWTransclusionNode.prototype.getRenderedDomElements = function ( domElements ) { ve.ce.MWTransclusionNode.prototype.getRenderedDomElements = function ( domElements ) {
var $elements = this.$( ve.ce.GeneratedContentNode.prototype.getRenderedDomElements.call( this, domElements ) ); var $elements = this.$( ve.ce.GeneratedContentNode.prototype.getRenderedDomElements.call( this, domElements ) ),
transclusionNode = this;
$elements $elements
.find( 'a[href][rel="mw:WikiLink"]' ).addBack( 'a[href][rel="mw:WikiLink"]' ) .find( 'a[href][rel="mw:WikiLink"]' ).addBack( 'a[href][rel="mw:WikiLink"]' )
.each( function () { .each( function () {
var targetData = ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref( var targetData = ve.dm.MWInternalLinkAnnotation.static.getTargetDataFromHref(
this.href, this.ownerDocument this.href, transclusionNode.getModelHtmlDocument()
), ),
normalisedHref = decodeURIComponent( targetData.title ); normalisedHref = decodeURIComponent( targetData.title );
if ( mw.Title.newFromText( normalisedHref ) ) { if ( mw.Title.newFromText( normalisedHref ) ) {