From: Fomafix <fomafix@googlemail.com>
Date: Mon, 9 Dec 2013 15:26:14 +0000 (+0000)
Subject: Remove unused variable and deprecated parameters
X-Git-Tag: 1.31.0-rc.0~17617^2
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=a5ca50212b8c7db4b69acddc9e22a0be7d1eaa34;p=lhc%2Fweb%2Fwiklou.git

Remove unused variable and deprecated parameters

Change-Id: I38ed73fbc4044b18c4370ddb1c54bb6ec4389950
---

diff --git a/resources/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
index e9afa4a2e4..ef287c4324 100644
--- a/resources/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -40,10 +40,10 @@
 			.attr( 'title', mw.msg( 'tooltip-ca-' + action ) +
 				( accesskeyTip ? ' ' + accesskeyTip[0] : '' )
 			)
-			.attr( 'href', mw.util.wikiScript() + '?' + $.param({
+			.attr( 'href', mw.util.wikiScript() + '?' + $.param( {
 					title: title,
 					action: action
-				})
+				} )
 			);
 
 		// Most common ID style
@@ -126,52 +126,46 @@
 			updateWatchLink( $link, action, 'loading' );
 
 			api = new mw.Api();
-			api[action](
-				title,
-				// Success
-				function ( watchResponse ) {
-					var $li, otherAction;
-
-					otherAction = action === 'watch' ? 'unwatch' : 'watch';
-					$li = $link.closest( 'li' );
-
-					mw.notify( $.parseHTML( watchResponse.message ), {
-						tag: 'watch-self'
-					} );
-
-					// Set link to opposite
-					updateWatchLink( $link, otherAction );
-
-					// Bug 12395 - update the watch checkbox on edit pages when the
-					// page is watched or unwatched via the tab.
-					if ( watchResponse.watched !== undefined ) {
-						$( '#wpWatchthis' ).prop( 'checked', true );
-					} else {
-						$( '#wpWatchthis' ).prop( 'checked', false );
-					}
-				},
-				// Error
-				function () {
-					var cleanTitle, msg, link;
-
-					// Reset link to non-loading mode
-					updateWatchLink( $link, action );
-
-					// Format error message
-					cleanTitle = title.replace( /_/g, ' ' );
-					link = mw.html.element(
-						'a', {
-							href: mw.util.getUrl( title ),
-							title: cleanTitle
-						}, cleanTitle
-					);
-					msg = mw.message( 'watcherrortext', link );
-
-					// Report to user about the error
-					mw.notify( msg, { tag: 'watch-self' } );
+			api[action]( title )
+			.done( function ( watchResponse ) {
+				var otherAction;
 
+				otherAction = action === 'watch' ? 'unwatch' : 'watch';
+
+				mw.notify( $.parseHTML( watchResponse.message ), {
+					tag: 'watch-self'
+				} );
+
+				// Set link to opposite
+				updateWatchLink( $link, otherAction );
+
+				// Bug 12395 - update the watch checkbox on edit pages when the
+				// page is watched or unwatched via the tab.
+				if ( watchResponse.watched !== undefined ) {
+					$( '#wpWatchthis' ).prop( 'checked', true );
+				} else {
+					$( '#wpWatchthis' ).prop( 'checked', false );
 				}
-			);
+			} )
+			.fail( function () {
+				var cleanTitle, msg, link;
+
+				// Reset link to non-loading mode
+				updateWatchLink( $link, action );
+
+				// Format error message
+				cleanTitle = title.replace( /_/g, ' ' );
+				link = mw.html.element(
+					'a', {
+						href: mw.util.getUrl( title ),
+						title: cleanTitle
+					}, cleanTitle
+				);
+				msg = mw.message( 'watcherrortext', link );
+
+				// Report to user about the error
+				mw.notify( msg, { tag: 'watch-self' } );
+			} );
 		} );
 	} );