Merge "Use new isTalkPage/isTalkNamespace methods"

diff --combined resources/src/mediawiki.page.watch.ajax.js
index 1b401c7,395992b..f7fbeef
--- 1/resources/src/mediawiki.page.watch.ajax.js
--- 2/resources/src/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page.watch.ajax.js
@@@ -14,7 -14,7 +14,7 @@@
   * @class mw.plugin.page.watch.ajax
   * @singleton
   */
 -( function ( mw, $ ) {
 +( function () {
        var watch,
                // The name of the page to watch or unwatch
                title = mw.config.get( 'wgRelevantPageName' );
@@@ -146,7 -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';
@@@ -187,4 -187,4 +187,4 @@@
                } );
        } );
  
 -}( mediaWiki, jQuery ) );
 +}() );

diff --combined resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
index 13c51aa,2feef7d..7284131
--- 1/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
--- 2/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
+++ b/resources/src/mediawiki.rcfilters/mw.rcfilters.Controller.js
@@@ -1,5 -1,5 +1,5 @@@
  /* eslint-disable no-restricted-properties */
 -( function ( mw, $ ) {
 +( function () {
  
        var byteLength = require( 'mediawiki.String' ).byteLength;
  
@@@ -75,8 -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
                                } );
@@@ -1217,4 -1217,4 +1217,4 @@@
                        this.filtersModel.getViewTrigger( view )
                );
        };
 -}( mediaWiki, jQuery ) );
 +}() );

diff --combined resources/src/mediawiki.special.watchlist/watchlist.js
index 715b5a5,070c12f..b9be51f
--- 1/resources/src/mediawiki.special.watchlist/watchlist.js
--- 2/resources/src/mediawiki.special.watchlist/watchlist.js
+++ b/resources/src/mediawiki.special.watchlist/watchlist.js
@@@ -1,7 -1,7 +1,7 @@@
  /*!
   * JavaScript for Special:Watchlist
   */
 -( function ( mw, $, OO ) {
 +( function () {
        $( function () {
                var api = new mw.Api(), $progressBar, $resetForm = $( '#mw-watchlist-resetbutton' );
  
@@@ -64,17 -64,15 +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;
  
@@@ -154,4 -152,5 +152,4 @@@
                }
        } );
  
 -}( mediaWiki, jQuery, OO )
 -);
 +}() );