Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/90070
Change subject: Hygiene: Add namespace helper function
......................................................................
Hygiene: Add namespace helper function
Change-Id: Id738123033f3c023b7fda98e37ca61f0396f8eec
---
M javascripts/common/application.js
M javascripts/common/history-alpha.js
M javascripts/modules/lazyload.js
M javascripts/modules/mf-toggle.js
M javascripts/modules/mf-watchstar.js
M javascripts/modules/uploads/lead-photo-init.js
6 files changed, 12 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/70/90070/1
diff --git a/javascripts/common/application.js
b/javascripts/common/application.js
index 1c59985..f350338 100644
--- a/javascripts/common/application.js
+++ b/javascripts/common/application.js
@@ -253,10 +253,15 @@
document.title = page.title;
}
+ function inNamespace( namespace ) {
+ return mw.config.get( 'wgNamespaceNumber' ) === mw.config.get(
'wgNamespaceIds' )[namespace];
+ }
+
$( init );
$.extend( M, {
init: init,
+ inNamespace: inNamespace,
jQuery: typeof jQuery !== 'undefined' ? jQuery : false,
getOrigin: getOrigin,
// FIXME: No Page object exists on initial page load but would
be better to make this a function of Page object
diff --git a/javascripts/common/history-alpha.js
b/javascripts/common/history-alpha.js
index 72294d6..9676c88 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -3,7 +3,6 @@
var
Page = M.require( 'Page' ),
- isSpecialPage = mw.config.get( 'wgNamespaceNumber' ) ===
mw.config.get( 'wgNamespaceIds' ).special,
History = window.History;
/**
@@ -95,7 +94,7 @@
updateQueryStringParameter: updateQueryStringParameter
};
- if ( History.enabled && !isSpecialPage ) {
+ if ( History.enabled && !M.inNamespace( 'special' ) ) {
$.extend( M.history, init() );
}
diff --git a/javascripts/modules/lazyload.js b/javascripts/modules/lazyload.js
index 1f895a0..dd1baaa 100644
--- a/javascripts/modules/lazyload.js
+++ b/javascripts/modules/lazyload.js
@@ -3,7 +3,7 @@
var searchOverlay = M.require( 'search' ).overlay,
history = M.history,
// FIXME: use fuzzy link hijacking in the main namespace - core
should be updated to make links more explicit
- useFuzzyLinkHijacking = mw.config.get( 'wgNamespaceNumber' )
=== mw.config.get( 'wgNamespaceIds' )[''];
+ useFuzzyLinkHijacking = M.inNamespace( '' );
if ( history.hijackLinks ) {
history.hijackLinks( $( '#content' ), useFuzzyLinkHijacking );
diff --git a/javascripts/modules/mf-toggle.js b/javascripts/modules/mf-toggle.js
index 03ba0c6..1f2f8d1 100644
--- a/javascripts/modules/mf-toggle.js
+++ b/javascripts/modules/mf-toggle.js
@@ -80,7 +80,7 @@
}
// avoid this running on Watchlist
- if ( mw.config.get( 'wgNamespaceNumber' ) !== mw.config.get(
'wgNamespaceIds' ).special && !mw.config.get( 'wgIsMainPage' ) ) {
+ if ( !M.inNamespace( 'special' ) && !mw.config.get( 'wgIsMainPage' ) ) {
init();
}
diff --git a/javascripts/modules/mf-watchstar.js
b/javascripts/modules/mf-watchstar.js
index 26ccda6..6224d1b 100644
--- a/javascripts/modules/mf-watchstar.js
+++ b/javascripts/modules/mf-watchstar.js
@@ -223,10 +223,9 @@
}
function init( page ) {
- var isSpecialPage = mw.config.get( 'wgNamespaceNumber' ) ===
mw.config.get( 'wgNamespaceIds' ).special,
- $container = $container || $( '#ca-watch'
).removeClass( 'watched watch-this-article' ).empty();
+ var $container = $container || $( '#ca-watch' ).removeClass(
'watched watch-this-article' ).empty();
// initialise on current page
- if ( !isSpecialPage ) {
+ if ( !M.inNamespace( 'special' ) ) {
initWatchListIcon( $container, page.title );
}
upgradeUI();
diff --git a/javascripts/modules/uploads/lead-photo-init.js
b/javascripts/modules/uploads/lead-photo-init.js
index 97b8ee5..4850639 100644
--- a/javascripts/modules/uploads/lead-photo-init.js
+++ b/javascripts/modules/uploads/lead-photo-init.js
@@ -25,11 +25,10 @@
function initialize() {
// FIXME: make some general function for that (or a page object
with a method)
- var namespaceIds = mw.config.get( 'wgNamespaceIds' ),
- namespace = mw.config.get( 'wgNamespaceNumber' ),
+ var
// FIXME: not updated on dynamic page loads
isEditable = mw.config.get( 'wgIsPageEditable' ),
- validNamespace = ( namespace === namespaceIds[''] ||
namespace === namespaceIds.user );
+ validNamespace = ( M.inNamespace( '' ) ||
M.inNamespace( 'user' ) );
if ( !M.isLoggedIn() && !showCta ) {
// Note with the CTA this is unnecessary but the new
nav requires showing the upload button at all times
--
To view, visit https://gerrit.wikimedia.org/r/90070
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id738123033f3c023b7fda98e37ca61f0396f8eec
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
