1 files changed, 28 insertions, 80 deletions

diff --git a/resources/mediawiki.api/mediawiki.api.edit.js b/resources/mediawiki.api/mediawiki.api.edit.js
index 49af9375..cc83a4b8 100644
--- a/resources/mediawiki.api/mediawiki.api.edit.js
+++ b/resources/mediawiki.api/mediawiki.api.edit.js
@@ -1,11 +1,8 @@
 /**
- * Additional mw.Api methods to assist with API calls related to editing wiki pages.
+ * @class mw.Api.plugin.edit
  */
 ( function ( mw, $ ) {
 
-	// Cache token so we don't have to keep fetching new ones for every single request.
-	var cachedToken = null;
-
 	$.extend( mw.Api.prototype, {
 
 		/**
@@ -13,102 +10,53 @@
 		 * If we have a cached token try using that, and if it fails, blank out the
 		 * cached token and start over.
 		 *
-		 * @param params {Object} API parameters
-		 * @param ok {Function} callback for success
-		 * @param err {Function} [optional] error callback
-		 * @return {jqXHR}
+		 * @param {Object} params API parameters
+		 * @param {Function} [ok] Success callback (deprecated)
+		 * @param {Function} [err] Error callback (deprecated)
+		 * @return {jQuery.Promise} See #post
 		 */
 		postWithEditToken: function ( params, ok, err ) {
-			var useTokenToPost, getTokenIfBad,
-				api = this;
-			if ( cachedToken === null ) {
-				// We don't have a valid cached token, so get a fresh one and try posting.
-				// We do not trap any 'badtoken' or 'notoken' errors, because we don't want
-				// an infinite loop. If this fresh token is bad, something else is very wrong.
-				useTokenToPost = function ( token ) {
-					params.token = token;
-					api.post( params, ok, err );
-				};
-				return api.getEditToken( useTokenToPost, err );
-			} else {
-				// We do have a token, but it might be expired. So if it is 'bad' then
-				// start over with a new token.
-				params.token = cachedToken;
-				getTokenIfBad = function ( code, result ) {
-					if ( code === 'badtoken' ) {
-						// force a new token, clear any old one
-						cachedToken = null;
-						api.postWithEditToken( params, ok, err );
-					} else {
-						err( code, result );
-					}
-				};
-				return api.post( params, { ok : ok, err : getTokenIfBad });
-			}
+			return this.postWithToken( 'edit', params ).done( ok ).fail( err );
 		},
 
 		/**
-		 * Api helper to grab an edit token
-		 *
-		 * token callback has signature ( String token )
-		 * error callback has signature ( String code, Object results, XmlHttpRequest xhr, Exception exception )
-		 * Note that xhr and exception are only available for 'http_*' errors
-		 *  code may be any http_* error code (see mw.Api), or 'token_missing'
+		 * Api helper to grab an edit token.
 		 *
-		 * @param tokenCallback {Function} received token callback
-		 * @param err {Function} error callback
-		 * @return {jqXHR}
+		 * @param {Function} [ok] Success callback
+		 * @param {Function} [err] Error callback
+		 * @return {jQuery.Promise}
+		 * @return {Function} return.done
+		 * @return {string} return.done.token Received token.
 		 */
-		getEditToken: function ( tokenCallback, err ) {
-			var parameters = {
-					action: 'tokens',
-					type: 'edit'
-				},
-				ok = function ( data ) {
-					var token;
-					// If token type is not available for this user,
-					// key 'edittoken' is missing or can contain Boolean false
-					if ( data.tokens && data.tokens.edittoken ) {
-						token = data.tokens.edittoken;
-						cachedToken = token;
-						tokenCallback( token );
-					} else {
-						err( 'token-missing', data );
-					}
-				},
-				ajaxOptions = {
-					ok: ok,
-					err: err,
-					// Due to the API assuming we're logged out if we pass the callback-parameter,
-					// we have to disable jQuery's callback system, and instead parse JSON string,
-					// by setting 'jsonp' to false.
-					jsonp: false
-				};
-
-			return this.get( parameters, ajaxOptions );
+		getEditToken: function ( ok, err ) {
+			return this.getToken( 'edit' ).done( ok ).fail( err );
 		},
 
 		/**
 		 * Create a new section of the page.
-		 * @param title {mw.Title|String} target page
-		 * @param header {String}
-		 * @param message {String} wikitext message
-		 * @param ok {Function} success handler
-		 * @param err {Function} error handler
-		 * @return {jqXHR}
+		 * @see #postWithEditToken
+		 * @param {mw.Title|String} title Target page
+		 * @param {string} header
+		 * @param {string} message wikitext message
+		 * @param {Function} [ok] Success handler
+		 * @param {Function} [err] Error handler
+		 * @return {jQuery.Promise}
 		 */
 		newSection: function ( title, header, message, ok, err ) {
-			var params = {
+			return this.postWithEditToken( {
 				action: 'edit',
 				section: 'new',
 				format: 'json',
 				title: title.toString(),
 				summary: header,
 				text: message
-			};
-			return this.postWithEditToken( params, ok, err );
+			}, ok, err );
 		}
+	} );
 
-	 } );
+	/**
+	 * @class mw.Api
+	 * @mixins mw.Api.plugin.edit
+	 */
 
 }( mediaWiki, jQuery ) );