Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189900
Change subject: mediawiki.api.login: Include second HTTP request in abort()
......................................................................
mediawiki.api.login: Include second HTTP request in abort()
Change-Id: I52e81781b2caf330ddb920b3ce842903808b7df3
---
M resources/src/mediawiki.api/mediawiki.api.login.js
1 file changed, 12 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/00/189900/1
diff --git a/resources/src/mediawiki.api/mediawiki.api.login.js
b/resources/src/mediawiki.api/mediawiki.api.login.js
index 88c8caa..bb6ff54 100644
--- a/resources/src/mediawiki.api/mediawiki.api.login.js
+++ b/resources/src/mediawiki.api/mediawiki.api.login.js
@@ -14,7 +14,7 @@
* @return {jQuery.Promise} See mw.Api#post
*/
login: function ( username, password ) {
- var params, apiPromise,
+ var params, apiPromise, innerPromise,
api = this;
params = {
@@ -24,10 +24,11 @@
};
apiPromise = api.post( params );
+
return apiPromise
.then( function ( data ) {
params.lgtoken = data.login.token;
- return api.post( params )
+ innerPromise = api.post( params )
.then( function ( data ) {
var code;
if ( data.login.result
!== 'Success' ) {
@@ -37,8 +38,16 @@
}
return data;
} );
+ return innerPromise;
} )
- .promise( { abort: apiPromise.abort } );
+ .promise( {
+ abort: function () {
+ apiPromise.abort();
+ if ( innerPromise ) {
+ innerPromise.abort();
+ }
+ }
+ } } );
}
} );
--
To view, visit https://gerrit.wikimedia.org/r/189900
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52e81781b2caf330ddb920b3ce842903808b7df3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
