From ce60ce82eaefa25957b6546016e257d9df2f4429 Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Sun, 17 Feb 2019 00:48:41 +0000 Subject: [PATCH] mediawiki.Title: Avoid 'this' in static method Follows-up 144103b0293. Also remove use of private mw.config.values, and remove redundant manual restoration. Change-Id: I3570dbfa2d2f524ade6b467821e493e950f2a605 --- resources/src/mediawiki.Title/Title.js | 2 +- .../suites/resources/mediawiki/mediawiki.Title.test.js | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/resources/src/mediawiki.Title/Title.js b/resources/src/mediawiki.Title/Title.js index ff7a40f804..6bb3bce2a6 100644 --- a/resources/src/mediawiki.Title/Title.js +++ b/resources/src/mediawiki.Title/Title.js @@ -687,7 +687,7 @@ * @return {boolean} Namespace is a signature namespace */ Title.wantSignaturesNamespace = function ( namespaceId ) { - return this.isTalkNamespace( namespaceId ) || + return Title.isTalkNamespace( namespaceId ) || mw.config.get( 'wgExtraSignatureNamespaces' ).indexOf( namespaceId ) !== -1; }; diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js index 84e1d4eb5a..fca1f7d016 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js @@ -324,19 +324,14 @@ } ); QUnit.test( 'wantSignaturesNamespace', function ( assert ) { - var namespaces = mw.config.values.wgExtraSignatureNamespaces; - - mw.config.values.wgExtraSignatureNamespaces = []; + mw.config.set( 'wgExtraSignatureNamespaces', [] ); assert.strictEqual( mw.Title.wantSignaturesNamespace( 0 ), false, 'Main namespace has no signatures' ); assert.strictEqual( mw.Title.wantSignaturesNamespace( 1 ), true, 'Talk namespace has signatures' ); assert.strictEqual( mw.Title.wantSignaturesNamespace( 2 ), false, 'NS2 has no signatures' ); assert.strictEqual( mw.Title.wantSignaturesNamespace( 3 ), true, 'NS3 has signatures' ); - mw.config.values.wgExtraSignatureNamespaces = [ 0 ]; + mw.config.set( 'wgExtraSignatureNamespaces', [ 0 ] ); assert.strictEqual( mw.Title.wantSignaturesNamespace( 0 ), true, 'Main namespace has signatures when explicitly defined' ); - - // Restore - mw.config.values.wgExtraSignatureNamespaces = namespaces; } ); QUnit.test( 'Throw error on invalid title', function ( assert ) { -- 2.20.1