jenkins-bot has submitted this change and it was merged.
Change subject: Use mw.Api.plugin.options to set user options
......................................................................
Use mw.Api.plugin.options to set user options
This requires MediaWiki version 1.25+.
Change-Id: I3a76b0b4ec403b3acdc29e64b0c750a3b57e252a
---
M extension.json
M resources/js/ext.uls.init.js
M resources/js/ext.uls.preferences.js
3 files changed, 8 insertions(+), 12 deletions(-)
Approvals:
Nikerabbit: Checked; Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 77e52ce..e46c4c4 100644
--- a/extension.json
+++ b/extension.json
@@ -156,6 +156,7 @@
},
"dependencies": [
"mediawiki.api",
+ "mediawiki.api.options",
"mediawiki.cookie",
"jquery.client",
"jquery.cookie"
@@ -219,7 +220,8 @@
"scripts": "js/ext.uls.preferences.js",
"dependencies": [
"mediawiki.user",
- "mediawiki.api"
+ "mediawiki.api",
+ "mediawiki.api.options"
],
"localBasePath": "resources",
"remoteExtPath": "UniversalLanguageSelector/resources"
diff --git a/resources/js/ext.uls.init.js b/resources/js/ext.uls.init.js
index 4dae749..b0c18ae 100644
--- a/resources/js/ext.uls.init.js
+++ b/resources/js/ext.uls.init.js
@@ -82,12 +82,7 @@
}
api = new mw.Api();
- // @todo Change this to api.saveOption when ULS minimum
MW version is 1.25
- api.postWithToken( 'options', {
- action: 'options',
- optionname: 'language',
- optionvalue: language
- } )
+ api.saveOption( 'language', language )
.done( function () {
location.reload();
} )
diff --git a/resources/js/ext.uls.preferences.js
b/resources/js/ext.uls.preferences.js
index 3316c85..4970ccd 100644
--- a/resources/js/ext.uls.preferences.js
+++ b/resources/js/ext.uls.preferences.js
@@ -149,11 +149,10 @@
callback.call( this, true );
} else {
// Logged in user. Use MW APIs to change
preferences
- new mw.Api().postWithToken( 'options', {
- action: 'options',
- optionname:
ulsPreferences.preferenceName,
- optionvalue: JSON.stringify(
ulsPreferences.preferences )
- } ).done( function () {
+ new mw.Api().saveOption(
+ ulsPreferences.preferenceName,
+ JSON.stringify(
ulsPreferences.preferences )
+ ).done( function () {
callback.call( this, true );
} ).fail( function () {
callback.call( this, false );
--
To view, visit https://gerrit.wikimedia.org/r/270732
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a76b0b4ec403b3acdc29e64b0c750a3b57e252a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Gerrit Patch Uploader <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
