From: Krinkle <krinkle@users.mediawiki.org>
Date: Thu, 15 Mar 2012 06:04:20 +0000 (+0000)
Subject: [mediawiki.action.watch] clean up
X-Git-Tag: 1.31.0-rc.0~24242
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22brouteur%22%2C%28%24id_rubrique%20?a=commitdiff_plain;h=3f126a38a567c039feaa69487223cf5a3fad2e70;p=lhc%2Fweb%2Fwiklou.git

[mediawiki.action.watch] clean up
* Fix implied global variable 'i' in mwUriGetAction()
* Indention nearly everything an extra level (svn di -x-uw)
* other minor js coding style
---

diff --git a/resources/mediawiki.action/mediawiki.action.watch.ajax.js b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
index f5f09f52a1..8d3b8fabc3 100644
--- a/resources/mediawiki.action/mediawiki.action.watch.ajax.js
+++ b/resources/mediawiki.action/mediawiki.action.watch.ajax.js
@@ -4,152 +4,158 @@
  */
 ( function ( $, mw, undefined ) {
 
-/**
- * The name of the page to watch or unwatch.
- */
-var title = mw.config.get( 'wgRelevantPageName', mw.config.get( 'wgPageName' ) );
-
-/**
- * Update the link text, link href attribute and (if applicable)
- * "loading" class.
- *
- * @param $link {jQuery} Anchor tag of (un)watch link
- * @param action {String} One of 'watch', 'unwatch'.
- * @param state {String} [optional] 'idle' or 'loading'. Default is 'idle'.
- */
-function updateWatchLink( $link, action, state ) {
-	// message keys 'watch', 'watching', 'unwatch' or 'unwatching'.
-	var	msgKey = state === 'loading' ? action + 'ing' : action,
-		accesskeyTip = $link.attr( 'title' ).match( mw.util.tooltipAccessKeyRegexp ),
+	/**
+	 * The name of the page to watch or unwatch.
+	 */
+	var title = mw.config.get( 'wgRelevantPageName', mw.config.get( 'wgPageName' ) );
+
+	/**
+	 * Update the link text, link href attribute and (if applicable)
+	 * "loading" class.
+	 *
+	 * @param $link {jQuery} Anchor tag of (un)watch link.
+	 * @param action {String} One of 'watch', 'unwatch'.
+	 * @param state {String} [optional] 'idle' or 'loading'. Default is 'idle'.
+	 */
+	function updateWatchLink( $link, action, state ) {
+		var accesskeyTip, msgKey, $li;
+
+		// message keys 'watch', 'watching', 'unwatch' or 'unwatching'.
+		msgKey = state === 'loading' ? action + 'ing' : action;
+		accesskeyTip = $link.attr( 'title' ).match( mw.util.tooltipAccessKeyRegexp );
 		$li = $link.closest( 'li' );
 
-	$link
-		.text( mw.msg( msgKey ) )
-		.attr( 'title', mw.msg( 'tooltip-ca-' + action ) +
-			( accesskeyTip ? ' ' + accesskeyTip[0] : '' )
-		)
-		.attr( 'href', mw.util.wikiScript() + '?' + $.param({
-				title: title,
-				action: action
-			})
-		);
-
-	// Special case for vector icon
-	if ( $li.hasClass( 'icon' ) ) {
-		if ( state === 'loading' ) {
-			$link.addClass( 'loading' );
-		} else {
-			$link.removeClass( 'loading' );
+		$link
+			.text( mw.msg( msgKey ) )
+			.attr( 'title', mw.msg( 'tooltip-ca-' + action ) +
+				( accesskeyTip ? ' ' + accesskeyTip[0] : '' )
+			)
+			.attr( 'href', mw.util.wikiScript() + '?' + $.param({
+					title: title,
+					action: action
+				})
+			);
+
+		// Special case for vector icon
+		if ( $li.hasClass( 'icon' ) ) {
+			if ( state === 'loading' ) {
+				$link.addClass( 'loading' );
+			} else {
+				$link.removeClass( 'loading' );
+			}
 		}
 	}
-}
 
-/**
- * @todo This should be moved somewhere more accessible.
- * @param url {String}
- * @return {String} The extracted action, defaults to 'view'.
- */
-function mwUriGetAction( url ) {
-	var	actionPaths = mw.config.get( 'wgActionPaths' ),
-		key, parts, m, action;
-
-	// @todo: Does MediaWiki give action path or query param
-	// precedence ? If the former, move this to the bottom
-	action = mw.util.getParamValue( 'action', url );
-	if ( action !== null ) {
-		return action;
-	}
+	/**
+	 * @todo This should be moved somewhere more accessible.
+	 * @param url {String}
+	 * @return {String} The extracted action, defaults to 'view'.
+	 */
+	function mwUriGetAction( url ) {
+		var action, actionPaths, key, i, m, parts;
+
+		actionPaths = mw.config.get( 'wgActionPaths' );
+
+		// @todo: Does MediaWiki give action path or query param
+		// precedence ? If the former, move this to the bottom
+		action = mw.util.getParamValue( 'action', url );
+		if ( action !== null ) {
+			return action;
+		}
+
+		for ( key in actionPaths ) {
+			if ( actionPaths.hasOwnProperty( key ) ) {
+				parts = actionPaths[key].split( '$1' );
+				for ( i = 0; i < parts.length; i += 1 ) {
+					parts[i] = $.escapeRE( parts[i] );
+				}
+				m = new RegExp( parts.join( '(.+)' ) ).exec( url );
+				if ( m && m[1] ) {
+					return key;
+				}
 
-	for ( key in actionPaths ) {
-		if ( actionPaths.hasOwnProperty( key ) ) {
-			parts = actionPaths[key].split( '$1' );
-			for ( i = 0; i < parts.length; i += 1 ) {
-				parts[i] = $.escapeRE( parts[i] );
-			}
-			m = new RegExp( parts.join( '(.+)' ) ).exec( url );
-			if ( m && m[1] ) {
-				return key;
 			}
-		
 		}
+
+		return 'view';
 	}
 
-	return 'view';
-}
+	$( document ).ready( function () {
+		var $links = $( '.mw-watchlink a, a.mw-watchlink, ' +
+			'#ca-watch a, #ca-unwatch a, #mw-unwatch-link1, ' +
+			'#mw-unwatch-link2, #mw-watch-link2, #mw-watch-link1' );
 
-$( document ).ready( function() {
-	var $links = $( '.mw-watchlink a, a.mw-watchlink, ' +
-		'#ca-watch a, #ca-unwatch a, #mw-unwatch-link1, ' +
-		'#mw-unwatch-link2, #mw-watch-link2, #mw-watch-link1' );
+		// Allowing people to add inline animated links is a little scary
+		$links = $links.filter( ':not( #bodyContent *, #content * )' );
 
-	// Allowing people to add inline animated links is a little scary
-	$links = $links.filter( ':not( #bodyContent *, #content * )' );
+		$links.click( function ( e ) {
+			var action, api, $link; 
 
-	$links.click( function( e ) {
-		var	$link, api,
 			action = mwUriGetAction( this.href );
 
-		if ( action !== 'watch' && action !== 'unwatch' ) {
-			// Could not extract target action from link url,
-			// let native browsing handle it further
-			return true;
-		}
-		e.preventDefault();
-		e.stopPropagation();
-		
-		$link = $( this );
-
-		updateWatchLink( $link, action, 'loading' );
-
-		api = new mw.Api();
-		api[action](
-			title,
-			// Success
-			function( watchResponse ) {
-				var	otherAction = action === 'watch' ? 'unwatch' : 'watch',
-					$li = $link.closest( 'li' );
+			if ( action !== 'watch' && action !== 'unwatch' ) {
+				// Could not extract target action from link url,
+				// let native browsing handle it further
+				return true;
+			}
+			e.preventDefault();
+			e.stopPropagation();
 
-				mw.util.jsMessage( watchResponse.message, 'ajaxwatch' );
+			$link = $( this );
 
-				// Set link to opposite
-				updateWatchLink( $link, otherAction );
+			updateWatchLink( $link, action, 'loading' );
 
-				// Most common ID style
-				if ( $li.prop( 'id' ) === 'ca-' + otherAction || $li.prop( 'id' ) === 'ca-' + action ) {
-					$li.prop( 'id', 'ca-' + 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' ).removeProp( 'checked' );
-				}
-			},
-			// Error
-			function(){		
-
-				// Reset link to non-loading mode
-				updateWatchLink( $link, action );
-				
-				// Format error message
-				var cleanTitle = title.replace( /_/g, ' ' );
-				var link = mw.html.element(
-					'a', {
-						'href': mw.util.wikiGetlink( title ),
-						'title': cleanTitle
-					}, cleanTitle
-				);
-				var html = mw.msg( 'watcherrortext', link );
-				
-				// Report to user about the error
-				mw.util.jsMessage( html, 'ajaxwatch' );
+			api = new mw.Api();
+			api[action](
+				title,
+				// Success
+				function ( watchResponse ) {
+					var $li, otherAction;
 
-			}
-		);
-	});
+					otherAction = action === 'watch' ? 'unwatch' : 'watch';
+					$li = $link.closest( 'li' );
 
-});
+					mw.util.jsMessage( watchResponse.message, 'ajaxwatch' );
+
+					// Set link to opposite
+					updateWatchLink( $link, otherAction );
+
+					// Most common ID style
+					if ( $li.prop( 'id' ) === 'ca-' + otherAction || $li.prop( 'id' ) === 'ca-' + action ) {
+						$li.prop( 'id', 'ca-' + 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' ).removeProp( 'checked' );
+					}
+				},
+				// Error
+				function () {
+					var cleanTitle, html, 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.wikiGetlink( title ),
+							title: cleanTitle
+						}, cleanTitle
+					);
+					html = mw.msg( 'watcherrortext', link );
+
+					// Report to user about the error
+					mw.util.jsMessage( html, 'ajaxwatch' );
+
+				}
+			);
+		});
+	});
 
-})( jQuery, mediaWiki );
+}( jQuery, mediaWiki ) );