mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue
synced 2024-11-17 19:21:39 +00:00
7fd843cd89
The talk overlay must subscribe to the creation of new topics so that the list of topics in the talk overlay contains the newly created topic. It does this by subscribing to the talk-discussion-added event and forcing a route refresh when that has completed. Additional changes to browser tests: 1) QA: CSS selector changed for talk overlay Since I42fd7b08c4b9d92dee549d06de8a0012ea037d28 the '.add' class was removed from the talk button. This makes the browser test fail but is a false positive. 2) One of the browser tests was using the same selector to mean two different elements - the add discussion button in the talk overlay is now clearly distinguish from the "add discussion" button that is blue and appears at the bottom of talk pages Change-Id: I935b3c5f37baf242c06585ae0e2f13d059b9c324
118 lines
3.8 KiB
JavaScript
118 lines
3.8 KiB
JavaScript
( function ( M, EventEmitter ) {
|
|
var
|
|
mobile = M.require( 'mobile.startup' ),
|
|
loader = mobile.rlModuleLoader,
|
|
loadingOverlay = mobile.loadingOverlay,
|
|
eventBus = new EventEmitter(),
|
|
PageGateway = mobile.PageGateway,
|
|
api = new mw.Api(),
|
|
gateway = new PageGateway( api ),
|
|
// eslint-disable-next-line jquery/no-global-selector
|
|
$talk = $( '.talk, [rel="discussion"]' ),
|
|
// use the plain return value here - T128273
|
|
title = $talk.attr( 'data-title' ),
|
|
overlayManager = M.require( 'skins.minerva.scripts/overlayManager' ),
|
|
skin = M.require( 'skins.minerva.scripts/skin' ),
|
|
inTalkNamespace = false,
|
|
pageTitle, talkTitle, talkNs, pageNs;
|
|
|
|
// T127190
|
|
if ( title ) {
|
|
title = decodeURIComponent( title );
|
|
}
|
|
|
|
// sanity check: the talk namespace needs to have the next higher integer
|
|
// of the page namespace (the api should add topics only to the talk page of the current
|
|
// page)
|
|
// (https://www.mediawiki.org/wiki/Manual:Using_custom_namespaces#Creating_a_custom_namespace)
|
|
// The method to get associated namespaces will change later (maybe), see T487
|
|
pageTitle = mw.Title.newFromText( mw.config.get( 'wgPageName' ) );
|
|
talkTitle = title ? mw.Title.newFromText( title ) : pageTitle.getTalkPage();
|
|
|
|
// Check that there is a valid page and talk title
|
|
if ( !pageTitle || !talkTitle ||
|
|
// the talk link points to something other than the current page
|
|
// so we chose to leave this as a normal link
|
|
pageTitle.getMainText() !== talkTitle.getMainText() ) {
|
|
return;
|
|
}
|
|
talkNs = talkTitle.getNamespaceId();
|
|
pageNs = pageTitle.getNamespaceId();
|
|
inTalkNamespace = talkNs === pageNs;
|
|
|
|
if ( pageNs + 1 !== talkNs && !inTalkNamespace ) {
|
|
return;
|
|
}
|
|
|
|
overlayManager.add( /^\/talk\/?(.*)$/, function ( id ) {
|
|
var title = talkTitle.toText(),
|
|
talkOptions = {
|
|
api: api,
|
|
title: title,
|
|
// T184273 using `getCurrentPage` because 'wgPageName'
|
|
// contains underscores instead of spaces.
|
|
currentPageTitle: M.getCurrentPage().title,
|
|
licenseMsg: skin.getLicenseMsg(),
|
|
eventBus: eventBus,
|
|
id: id
|
|
};
|
|
|
|
// talk case
|
|
if ( id ) {
|
|
return loader.loadModule( 'mobile.talk.overlays' ).then( function () {
|
|
if ( id === 'new' ) {
|
|
return new ( M.require( 'mobile.talk.overlays/TalkSectionAddOverlay' ) )( talkOptions );
|
|
}
|
|
return new ( M.require( 'mobile.talk.overlays/TalkSectionOverlay' ) )( talkOptions );
|
|
} );
|
|
} else {
|
|
return mobile.talk.overlay( title, gateway );
|
|
}
|
|
} );
|
|
|
|
/**
|
|
* Create route '#/talk'
|
|
* @ignore
|
|
*/
|
|
function init() {
|
|
$talk.on( 'click', function () {
|
|
if ( $talk.hasClass( 'add' ) ) {
|
|
window.location.hash = '#/talk/new';
|
|
} else {
|
|
window.location.hash = '#/talk';
|
|
}
|
|
return false;
|
|
} );
|
|
// After adding a new topic, we need to force a refresh of the talk topics
|
|
eventBus.on( 'talk-discussion-added', function () {
|
|
// a setTimeout is necessary since talk-discussion-added is fired
|
|
// BEFORE the overlay is closed. (FIXME)
|
|
window.setTimeout( function () {
|
|
// Force a change in the address bar
|
|
// This is important is #/talk is the current route
|
|
// (e.g. as is the case after the add discussion overlay has closed)
|
|
overlayManager.router.navigate( '#/talk/', true );
|
|
// We use second parameter to turn on replaceState
|
|
// this ensure nobody knows above the route change above!
|
|
overlayManager.router.navigate( '#/talk', true );
|
|
}, 300 );
|
|
} );
|
|
}
|
|
|
|
init();
|
|
if ( inTalkNamespace ) {
|
|
// reload the page after the new discussion was added
|
|
eventBus.on( 'talk-added-wo-overlay', function () {
|
|
var overlay = loadingOverlay();
|
|
|
|
window.location.hash = '';
|
|
// setTimeout to make sure, that loadingOverlay's overlayenabled class on html doesnt
|
|
// get removed by OverlayManager (who closes TalkSectionAddOverlay).
|
|
window.setTimeout( function () {
|
|
overlay.show();
|
|
window.location.reload();
|
|
}, 10 );
|
|
} );
|
|
}
|
|
}( mw.mobileFrontend, OO.EventEmitter ) );
|