jenkins-bot has submitted this change and it was merged.
Change subject: replaced js wg vars with mw.config.get due to deprecation
......................................................................
replaced js wg vars with mw.config.get due to deprecation
Change-Id: Iad52050358190a35660b311ae0afc70c760495e6
---
M resources/bluespice.extjs/BS/form/NamespaceCombo.js
M resources/bluespice.extjs/BS/store/LocalNamespaces.js
M resources/bluespice/bluespice.ping.js
3 files changed, 9 insertions(+), 8 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
index 92bd189..db7bdbc 100644
--- a/resources/bluespice.extjs/BS/form/NamespaceCombo.js
+++ b/resources/bluespice.extjs/BS/form/NamespaceCombo.js
@@ -27,7 +27,7 @@
//from text to id.
if( Ext.isString(value) ) {
var normText = value.toLowerCase().replace(' ', '_');
- var id = wgNamespaceIds[normText];
+ var id = mw.config.get( "wgNamespaceIds" )[normText];
if( id ) {
value = id;
}
diff --git a/resources/bluespice.extjs/BS/store/LocalNamespaces.js
b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
index 062fb23..87b73ab 100644
--- a/resources/bluespice.extjs/BS/store/LocalNamespaces.js
+++ b/resources/bluespice.extjs/BS/store/LocalNamespaces.js
@@ -24,7 +24,8 @@
});
}
- for ( var id in wgFormattedNamespaces ) {
+ var aFormattedNamespaces = mw.config.get(
"wgFormattedNamespaces" );
+ for ( var id in aFormattedNamespaces ) {
if( this.excludeIds.indexOf( +id ) !== -1 ) {
continue;
}
@@ -33,7 +34,7 @@
if ( namespace.id === 0 ) {
namespace.namespace = mw.message(
'blanknamespace' ).plain();
} else {
- namespace.namespace = wgFormattedNamespaces[id];
+ namespace.namespace = mw.config.get(
"wgFormattedNamespaces" )[id];
}
namespaces.push( namespace );
diff --git a/resources/bluespice/bluespice.ping.js
b/resources/bluespice/bluespice.ping.js
index 7d1c679..fefa0bd 100644
--- a/resources/bluespice/bluespice.ping.js
+++ b/resources/bluespice/bluespice.ping.js
@@ -26,14 +26,14 @@
}
$.post(
- wgScriptPath + '/index.php',
+ mw.config.get( "wgScriptPath" ) + '/index.php',
{
action:'ajax',
rs:'BsCore::ajaxBSPing',
- iArticleID: wgArticleId,
- sTitle: wgTitle,
- iNamespace: wgNamespaceNumber,
- iRevision: wgCurRevisionId,
+ iArticleID: mw.config.get( "wgArticleId" ),
+ sTitle: mw.config.get( "wgTitle" ),
+ iNamespace: mw.config.get( "wgNamespaceNumber"
),
+ iRevision: mw.config.get( "wgCurRevisionId" ),
BsPingData: BsPingData
},
BSPing.pingCallback( aListenersToGo )
--
To view, visit https://gerrit.wikimedia.org/r/232910
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iad52050358190a35660b311ae0afc70c760495e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Tweichart <weich...@hallowelt.biz>
Gerrit-Reviewer: Mglaser <gla...@hallowelt.biz>
Gerrit-Reviewer: Pwirth <wi...@hallowelt.biz>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
