From 4a85ef3162b76d58c6d5d79bfd01a5b24309ee38 Mon Sep 17 00:00:00 2001
From: Krinkle <krinkle@users.mediawiki.org>
Date: Thu, 15 Mar 2012 05:54:58 +0000
Subject: [PATCH] [mediawiki.action.watch] Move re-used logic into local
 function * Follows-up r112440, r107969, r107350

Change-Id: I8c63dcc8b2af0369c42b11837fda927671565ad2
---
 .../mediawiki.api/mediawiki.api.watch.js      | 54 ++++++++++---------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/resources/mediawiki.api/mediawiki.api.watch.js b/resources/mediawiki.api/mediawiki.api.watch.js
index 8ed6832091..302a2d31dc 100644
--- a/resources/mediawiki.api/mediawiki.api.watch.js
+++ b/resources/mediawiki.api/mediawiki.api.watch.js
@@ -4,47 +4,51 @@
  */
 ( function( $, mw ) {
 
+	/**
+	 * @context {mw.Api}
+	 */
+	function doWatchInternal( page, success, err, addParams ) {
+		var params = {
+			action: 'watch',
+			title: String( page ),
+			token: mw.user.tokens.get( 'watchToken' ),
+			uselang: mw.config.get( 'wgUserLanguage' )
+		};
+		function ok( data ) {
+			success( data.watch );
+		}
+		if ( addParams ) {
+			$.extend( params, addParams );
+		}
+		return this.post( params, { ok: ok, err: err } );
+	}
+
 	$.extend( mw.Api.prototype, {
 		/**
 		 * Convinience method for 'action=watch'.
 		 *
 		 * @param page {String|mw.Title} Full page name or instance of mw.Title
-		 * @param success {Function} callback to which the watch object will be passed
-		 * watch object contains 'title' (full page name), 'watched' (boolean) and
+		 * @param success {Function} Callback to which the watch object will be passed.
+		 * Watch object contains properties 'title' (full pagename), 'watched' (boolean) and
 		 * 'message' (parsed HTML of the 'addedwatchtext' message).
-		 * @param _unwatch {Boolean} Internally used to re-use this logic for unwatch(),
-		 * do not use outside this module.
-		 * @param err {Function} callback if error (optional)
+		 * @param err {Function} Error callback (optional)
 		 * @return {jqXHR}
 		 */
-		watch: function( page, success, err, _unwatch ) {
-			var params, ok;
-			params = {
-				action: 'watch',
-				title: String( page ),
-				token: mw.user.tokens.get( 'watchToken' ),
-				uselang: mw.config.get( 'wgUserLanguage' )
-			};
-			if ( _unwatch ) {
-				params.unwatch = 1;
-			}
-			ok = function( data ) {
-				success( data.watch );
-			};
-			return this.post( params, { ok: ok, err: err } );
+		watch: function ( page, success, err ) {
+			return doWatchInternal.call( this, page, success, err );
 		},
 		/**
 		 * Convinience method for 'action=watch&unwatch=1'.
 		 *
 		 * @param page {String|mw.Title} Full page name or instance of mw.Title
-		 * @param success {Function} callback to which the watch object will be passed
-		 * watch object contains 'title' (full page name), 'unwatched' (boolean) and
+		 * @param success {Function} Callback to which the watch object will be passed.
+		 * Watch object contains properties 'title' (full pagename), 'watched' (boolean) and
 		 * 'message' (parsed HTML of the 'removedwatchtext' message).
-		 * @param err {Function} callback if error (optional)
+		 * @param err {Function} Error callback (optional)
 		 * @return {jqXHR}
 		 */
-		unwatch: function( page, success, err ) {
-			return this.watch( page, success, err, true );
+		unwatch: function ( page, success, err ) {
+			return doWatchInternal.call( this, page, success, err, { unwatch: 1 } );
 		}
 
 	} );
-- 
2.20.1