Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175970
Change subject: Use mw.Api.postWithToken( 'edit' ) when possible
......................................................................
Use mw.Api.postWithToken( 'edit' ) when possible
Saves us the trouble of getting the edit token ourselves, or when
replacing mw.Api.postWithEditToken, we don't need to load extra
module just for wrapper function which does exactly the same.
Additionally, added parenthesis to scope new operator where used
in the lines I touched.
Change-Id: Ic540e5a1f1a38fc41823b8d50340b57f12d1c482
---
M Resources.php
M resources/js/ext.translate.editor.helpers.js
M resources/js/ext.translate.editor.js
M resources/js/ext.translate.special.pagemigration.js
M resources/js/ext.translate.special.pagepreparation.js
M resources/js/ext.translate.storage.js
6 files changed, 8 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/70/175970/1
diff --git a/Resources.php b/Resources.php
index 1c5a293..6d3b1d0 100644
--- a/Resources.php
+++ b/Resources.php
@@ -59,7 +59,6 @@
'mediawiki.util',
'mediawiki.Uri',
'mediawiki.api',
- 'mediawiki.api.edit',
'mediawiki.api.parse',
'mediawiki.user',
'mediawiki.jqueryMsg',
@@ -349,7 +348,7 @@
'styles' => 'resources/css/ext.translate.special.pagemigration.css',
'scripts' => 'resources/js/ext.translate.special.pagemigration.js',
'dependencies' => array(
- 'mediawiki.api.edit',
+ 'mediawiki.api',
'mediawiki.ui.button',
'jquery.ajaxdispatcher',
),
@@ -378,7 +377,6 @@
'dependencies' => array(
'mediawiki.ui',
'mediawiki.api',
- 'mediawiki.api.edit',
'jquery.mwExtension',
'mediawiki.action.history.diff',
'mediawiki.jqueryMsg',
diff --git a/resources/js/ext.translate.editor.helpers.js
b/resources/js/ext.translate.editor.helpers.js
index a58f415..9c08552 100644
--- a/resources/js/ext.translate.editor.helpers.js
+++ b/resources/js/ext.translate.editor.helpers.js
@@ -56,12 +56,11 @@
deferred = new $.Deferred(),
newDocumentation =
translateEditor.$editor.find( '.tux-textarea-documentation' ).val();
- deferred = api.post( {
+ deferred = api.postWithToken( 'edit', {
action: 'edit',
title: translateEditor.message.title
.replace( /\/[a-z\-]+$/, '/' +
mw.config.get( 'wgTranslateDocumentationLanguageCode' ) ),
- text: newDocumentation,
- token: mw.user.tokens.get( 'editToken' )
+ text: newDocumentation
} ).done( function ( response ) {
var $messageDesc =
translateEditor.$editor.find( '.infocolumn-block .message-desc' );
diff --git a/resources/js/ext.translate.editor.js
b/resources/js/ext.translate.editor.js
index 1a61c0d..4bae5a1 100644
--- a/resources/js/ext.translate.editor.js
+++ b/resources/js/ext.translate.editor.js
@@ -270,10 +270,9 @@
// @TODO devise better algorithm
if ( this.$messageItem.is( '.fuzzy, .untranslated' ) ) {
// We can just ignore the result even if it
fails
- new mw.Api().post( {
+ (new mw.Api()).postWithToken( 'edit', {
action: 'hardmessages',
- title: this.message.title,
- token: mw.user.tokens.get( 'editToken' )
+ title: this.message.title
} );
}
},
diff --git a/resources/js/ext.translate.special.pagemigration.js
b/resources/js/ext.translate.special.pagemigration.js
index 90def74..7b72bae 100644
--- a/resources/js/ext.translate.special.pagemigration.js
+++ b/resources/js/ext.translate.special.pagemigration.js
@@ -20,7 +20,7 @@
title = 'Translations:' + pageName + '/' + identifier +
'/' + langCode;
summary = $( '#pm-summary' ).val();
- deferred = api.postWithEditToken( {
+ deferred = api.postWithToken( 'edit', {
action: 'edit',
format: 'json',
watchlist: 'nochange',
diff --git a/resources/js/ext.translate.special.pagepreparation.js
b/resources/js/ext.translate.special.pagepreparation.js
index 538fefc..58d96cd 100644
--- a/resources/js/ext.translate.special.pagepreparation.js
+++ b/resources/js/ext.translate.special.pagepreparation.js
@@ -10,7 +10,7 @@
function savePage( pageName, pageContent ) {
var api = new mw.Api();
- return api.postWithEditToken( {
+ return api.postWithToken( 'edit', {
action: 'edit',
format: 'json',
title: pageName,
diff --git a/resources/js/ext.translate.storage.js
b/resources/js/ext.translate.storage.js
index c635249..4e7427b 100644
--- a/resources/js/ext.translate.storage.js
+++ b/resources/js/ext.translate.storage.js
@@ -21,7 +21,7 @@
* @return {jQuery.Promise}
*/
save: function ( title, translation ) {
- var deferred = new mw.Api().postWithEditToken( {
+ var deferred = (new mw.Api()).postWithToken( 'edit', {
action: 'edit',
title: title,
text: translation,
--
To view, visit https://gerrit.wikimedia.org/r/175970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic540e5a1f1a38fc41823b8d50340b57f12d1c482
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
