jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/350838 )
Change subject: Hotfix for c40dbee
......................................................................
Hotfix for c40dbee
Implemented some feedback that was given after the merge:
* Changed back to using POST instead of GET.
* Changed callback functions from deprecated ones.
Change-Id: I2fd4a09b8b79df51130435e421aae58d0bfc97b4
---
M modules/ext.wikispeech.js
M tests/qunit/ext.wikispeech.test.js
2 files changed, 12 insertions(+), 11 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.wikispeech.js b/modules/ext.wikispeech.js
index e828851..298e2df 100644
--- a/modules/ext.wikispeech.js
+++ b/modules/ext.wikispeech.js
@@ -780,6 +780,7 @@
var serverUrl = mw.config.get( 'wgWikispeechServerUrl'
);
$.ajax( {
url: serverUrl,
+ method: 'POST',
data: {
// jscs:disable
requireCamelCaseOrUpperCaseIdentifiers
lang: mw.config.get(
'wgPageContentLanguage' ),
@@ -789,23 +790,23 @@
},
dataType: 'json',
beforeSend: function ( jqXHR, settings ) {
- mw.log( 'Sending request:',
settings.url );
+ mw.log( 'Sending request: ' +
settings.url + '?' + settings.data );
$utterance.prop( 'waitingForResponse',
true );
- },
- success: function ( data ) {
+ }
+ } )
+ .done( function ( data ) {
mw.log( 'Response received:', data );
callback( data );
- },
- error: function ( jqXHR, textStatus ) {
+ } )
+ .fail( function ( jqXHR, textStatus ) {
mw.log.warn(
'Request failed, error type "'
+ textStatus + '":',
this.url
);
- },
- complete: function () {
+ } )
+ .always( function () {
$utterance.prop( 'waitingForResponse',
false );
- }
- } );
+ } );
};
/**
diff --git a/tests/qunit/ext.wikispeech.test.js
b/tests/qunit/ext.wikispeech.test.js
index 147a25c..21c13aa 100644
--- a/tests/qunit/ext.wikispeech.test.js
+++ b/tests/qunit/ext.wikispeech.test.js
@@ -166,8 +166,8 @@
assert.strictEqual( wikispeech.requestTts.called, true );
assert.strictEqual(
- server.requests[ 0 ].url,
-
'http://server.url/wikispeech/?lang=en&input_type=text&input=An%20utterance.'
+ server.requests[ 0 ].requestBody,
+ 'lang=en&input_type=text&input=An+utterance.'
);
} );
--
To view, visit https://gerrit.wikimedia.org/r/350838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2fd4a09b8b79df51130435e421aae58d0bfc97b4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikispeech
Gerrit-Branch: master
Gerrit-Owner: Sebastian Berlin (WMSE) <sebastian.ber...@wikimedia.se>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Lokal Profil <lokal.pro...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
