jenkins-bot has submitted this change and it was merged.
Change subject: Don't nest mw-content-text element when reloading diff
......................................................................
Don't nest mw-content-text element when reloading diff
Bug: T144391
Change-Id: I5763c6c4288bfcfef03df0cd949715d21430c9af
---
M modules/ext.RevisionSlider.DiffPage.js
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
WMDE-Fisch: Verified
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.RevisionSlider.DiffPage.js
b/modules/ext.RevisionSlider.DiffPage.js
index 9d09b49..faca14f 100644
--- a/modules/ext.RevisionSlider.DiffPage.js
+++ b/modules/ext.RevisionSlider.DiffPage.js
@@ -55,14 +55,18 @@
$printFooter = $( '.printfooter' ),
scrollLeft = $container.find(
'.mw-revslider-revisions-container' ).scrollLeft();
+ // Add our current rendered slider into the
newly loaded container
$data = $( data );
$data.find( '.mw-revslider-container'
).replaceWith( $container );
+
+ // Replace the elements on the page with the
newly loaded elements
$navigation.replaceWith( $data.find( '#p-views'
) );
$catLinks.replaceWith( $data.find( '#catlinks'
) );
$sidePanel.replaceWith( $data.find( '#mw-panel'
) );
$printFooter.replaceWith( $data.find(
'.printfooter' ) );
- $contentText.html( $data.find(
'#mw-content-text' ) )
- .find(
'.mw-revslider-revisions-container' ).scrollLeft( scrollLeft );
+ $contentText.replaceWith( $data.find(
'#mw-content-text' ) );
+
+ $( '.mw-revslider-revisions-container'
).scrollLeft( scrollLeft );
mw.hook( 'wikipage.content' ).fire(
$contentText );
mw.hook( 'wikipage.diff' ).fire(
$contentText.find( 'table.diff' ) );
--
To view, visit https://gerrit.wikimedia.org/r/317472
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5763c6c4288bfcfef03df0cd949715d21430c9af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RevisionSlider
Gerrit-Branch: master
Gerrit-Owner: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: WMDE-leszek <leszek.mani...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
