Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/271490
Change subject: MediaWiki JS: Use wgNamespaceIds for namespace constants
......................................................................
MediaWiki JS: Use wgNamespaceIds for namespace constants
Avoids duplication of numerical constants.
Fix instance of variable changing meaning (ns = ns.toLowerString()).
Change-Id: I0e21c51d0e1bdf8340d5d7c927cee7619171e14b
---
M resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
M resources/src/mediawiki/mediawiki.Title.js
2 files changed, 11 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/90/271490/1
diff --git a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
index 4f1b874..c88395e 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.NamespaceInputWidget.js
@@ -40,14 +40,14 @@
mw.widgets.NamespaceInputWidget.prototype.getNamespaceDropdownOptions =
function ( config ) {
var options,
exclude = config.exclude || [],
- NS_MAIN = 0;
+ mainNamespace = mw.config.get( 'wgNamespaceIds' )[ '' ];
options = $.map( mw.config.get( 'wgFormattedNamespaces' ),
function ( name, ns ) {
- if ( ns < NS_MAIN || exclude.indexOf( Number( ns ) )
!== -1 ) {
+ if ( ns < mainNamespace || exclude.indexOf( Number( ns
) ) !== -1 ) {
return null; // skip
}
ns = String( ns );
- if ( ns === String( NS_MAIN ) ) {
+ if ( ns === String( mainNamespace ) ) {
name = mw.message( 'blanknamespace' ).text();
}
return { data: ns, label: name };
diff --git a/resources/src/mediawiki/mediawiki.Title.js
b/resources/src/mediawiki/mediawiki.Title.js
index ffb3041..7f115b1 100644
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -54,40 +54,42 @@
var
+ namespaceIds = mw.config.get( 'wgNamespaceIds' ),
+
/**
* @private
* @static
* @property NS_MAIN
*/
- NS_MAIN = 0,
+ NS_MAIN = namespaceIds[ '' ],
/**
* @private
* @static
* @property NS_TALK
*/
- NS_TALK = 1,
+ NS_TALK = namespaceIds.talk,
/**
* @private
* @static
* @property NS_SPECIAL
*/
- NS_SPECIAL = -1,
+ NS_SPECIAL = namespaceIds.special,
/**
* @private
* @static
* @property NS_MEDIA
*/
- NS_MEDIA = -2,
+ NS_MEDIA = namespaceIds.media,
/**
* @private
* @static
* @property NS_FILE
*/
- NS_FILE = 6,
+ NS_FILE = namespaceIds.file,
/**
* @private
@@ -125,8 +127,7 @@
if ( typeof ns !== 'string' ) {
return false;
}
- ns = ns.toLowerCase();
- id = mw.config.get( 'wgNamespaceIds' )[ ns ];
+ id = namespaceIds[ ns.toLowerCase() ];
if ( id === undefined ) {
return false;
}
--
To view, visit https://gerrit.wikimedia.org/r/271490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0e21c51d0e1bdf8340d5d7c927cee7619171e14b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
