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

Merge "Improve how new topic tool avoids conflicts with NWE new section"

Browse source
This commit is contained in:
jenkins-bot 2021-07-01 17:21:14 +00:00 committed by Gerrit Code Review
parent 16f6715fe7 dce09e61b7
commit 5663796725
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/ReplyLinksController.js
View file

@ -22,8 +22,6 @@ function ReplyLinksController( $pageContainer ) {
// for now just don't enable the tool there
var pageExists = !!mw.config.get( 'wgRelevantArticleId' );
if ( $addSectionTab.length && pageExists ) {
// Disable VisualEditor's new section editor (in wikitext mode / NWE), to allow our own
$addSectionTab.off( '.ve-target' );
this.$addSectionLink = $addSectionTab.find( 'a' );
this.$addSectionLink.on( 'click keypress', this.onAddSectionLinkClickHandler );
}
@ -56,6 +54,11 @@ ReplyLinksController.prototype.onAddSectionLinkClick = function ( e ) {
}
e.preventDefault();
// Disable VisualEditor's new section editor (in wikitext mode / NWE), to allow our own.
// We do this on first click, because we don't control the order in which our code and NWE code
// runs, so its event handlers may not be registered yet.
$( e.target ).closest( '#ca-addsection' ).off( '.ve-target' );
this.emit( 'link-click', utils.NEW_TOPIC_COMMENT_ID, $( e.target ) );
};
@ -111,9 +114,6 @@ ReplyLinksController.prototype.clearActiveLink = function () {
// have it redo setup to fix those.
if ( mw.libs.ve && mw.libs.ve.setupEditLinks ) {
mw.libs.ve.setupEditLinks();
// Disable VisualEditor's new section editor (in wikitext mode / NWE), to allow our own
// eslint-disable-next-line no-jquery/no-global-selector
$( '#ca-addsection' ).off( '.ve-target' );
}
this.$activeLink = null;