From c5c7980c7dc30644fab9ef2822bd7053a542593a Mon Sep 17 00:00:00 2001 From: Ed Sanders Date: Thu, 13 Sep 2018 19:43:04 +0100 Subject: [PATCH] Use new isTalkPage/isTalkNamespace methods Change-Id: I291738ff6ebb63df2e405e98131dd80f3ddf2db6 --- resources/src/mediawiki.page.watch.ajax.js | 2 +- .../src/mediawiki.rcfilters/mw.rcfilters.Controller.js | 4 ++-- resources/src/mediawiki.special.watchlist/watchlist.js | 8 +++----- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/resources/src/mediawiki.page.watch.ajax.js b/resources/src/mediawiki.page.watch.ajax.js index 2002b9f87d..395992b290 100644 --- a/resources/src/mediawiki.page.watch.ajax.js +++ b/resources/src/mediawiki.page.watch.ajax.js @@ -146,7 +146,7 @@ .done( function ( watchResponse ) { var message, otherAction = action === 'watch' ? 'unwatch' : 'watch'; - if ( mwTitle.getNamespaceId() > 0 && mwTitle.getNamespaceId() % 2 === 1 ) { + if ( mwTitle.isTalkPage() ) { message = action === 'watch' ? 'addedwatchtext-talk' : 'removedwatchtext-talk'; } else { message = action === 'watch' ? 'addedwatchtext' : 'removedwatchtext'; diff --git a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js index 1664e86135..2feef7d95e 100644 --- a/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js +++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js @@ -75,8 +75,8 @@ label: label || mw.msg( 'blanknamespace' ), description: '', identifiers: [ - ( namespaceID < 0 || namespaceID % 2 === 0 ) ? - 'subject' : 'talk' + mw.Title.isTalkNamespace( namespaceID ) ? + 'talk' : 'subject' ], cssClass: 'mw-changeslist-ns-' + namespaceID } ); diff --git a/resources/src/mediawiki.special.watchlist/watchlist.js b/resources/src/mediawiki.special.watchlist/watchlist.js index 565ed2c974..070c12f532 100644 --- a/resources/src/mediawiki.special.watchlist/watchlist.js +++ b/resources/src/mediawiki.special.watchlist/watchlist.js @@ -64,17 +64,15 @@ $watchlistLine = $unwatchLink.closest( 'li, table' ) .find( '[data-target-page]' ), pageTitle = $watchlistLine.data( 'targetPage' ), - isTalk = mw.Title.newFromText( pageTitle ).getNamespaceId() % 2 === 1; + isTalk = mw.Title.newFromText( pageTitle ).isTalkPage(); // Utility function for looping through each watchlist line that matches // a certain page or its associated page (e.g. Talk) function forEachMatchingTitle( title, callback ) { var titleObj = mw.Title.newFromText( title ), - pageNamespaceId = titleObj.getNamespaceId(), - isTalk = pageNamespaceId % 2 === 1, - associatedTitle = mw.Title.makeTitle( isTalk ? pageNamespaceId - 1 : pageNamespaceId + 1, - titleObj.getMainText() ).getPrefixedText(); + associatedTitleObj = titleObj.isTalkPage() ? titleObj.getSubjectPage() : titleObj.getTalkPage(), + associatedTitle = associatedTitleObj.getPrefixedText(); $( '.mw-changeslist-line' ).each( function () { var $this = $( this ), $row, $unwatchLink; -- 2.20.1