From e9bfe9bf562d19083957800468c2b27419a76dae Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Wed, 11 Feb 2015 04:13:54 +0000
Subject: [PATCH] mediawiki.api.login: Include second HTTP request in abort()

Change-Id: I52e81781b2caf330ddb920b3ce842903808b7df3
---
 .../src/mediawiki.api/mediawiki.api.login.js      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/resources/src/mediawiki.api/mediawiki.api.login.js b/resources/src/mediawiki.api/mediawiki.api.login.js
index 88c8caa737..25257927b4 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();
+						}
+					}
+				} );
 		}
 	} );
 
-- 
2.20.1