X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=blobdiff_plain;f=resources%2Fsrc%2Fjquery%2Fjquery.accessKeyLabel.js;h=f25944c94efcd28be443385eb5f22e9990aa8a52;hb=2231d4e859628fc4d2fb63a7a752ead5b91ffef2;hp=a6106e456268c6c6cdb3f9583533ea5050cad667;hpb=4518a5a86ce81faff53407d4603b8643144a9d33;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/jquery/jquery.accessKeyLabel.js
index a6106e4562..f25944c94e 100644
--- a/resources/src/jquery/jquery.accessKeyLabel.js
+++ b/resources/src/jquery/jquery.accessKeyLabel.js
@@ -5,217 +5,225 @@
  */
 ( function ( $, mw ) {
 
-// Cached access key modifiers for used browser
-var cachedAccessKeyModifiers,
-
-	// Whether to use 'test-' instead of correct prefix (used for testing)
-	useTestPrefix = false,
-
-	// tag names which can have a label tag
-	// https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Form-associated_content
-	labelable = 'button, input, textarea, keygen, meter, output, progress, select';
-
-/**
- * Find the modifier keys that need to be pressed together with the accesskey to trigger the input.
- *
- * The result is dependant on the ua paramater or the current platform.
- * For browsers that support accessKeyLabel, #getAccessKeyLabel never calls here.
- * Valid key values that are returned can be: ctrl, alt, option, shift, esc
- *
- * @private
- * @param {Object} [ua] An object with a 'userAgent' and 'platform' property.
- * @return {Array} Array with 0 or more of the string values: ctrl, option, alt, shift, esc
- */
-function getAccessKeyModifiers( ua ) {
-	// use cached prefix if possible
-	if ( !ua && cachedAccessKeyModifiers ) {
-		return cachedAccessKeyModifiers;
-	}
+	// Cached access key modifiers for used browser
+	var cachedAccessKeyModifiers,
+
+		// Whether to use 'test-' instead of correct prefix (used for testing)
+		useTestPrefix = false,
+
+		// tag names which can have a label tag
+		// https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/Content_categories#Form-associated_content
+		labelable = 'button, input, textarea, keygen, meter, output, progress, select';
+
+	/**
+	 * Find the modifier keys that need to be pressed together with the accesskey to trigger the input.
+	 *
+	 * The result is dependant on the ua paramater or the current platform.
+	 * For browsers that support accessKeyLabel, #getAccessKeyLabel never calls here.
+	 * Valid key values that are returned can be: ctrl, alt, option, shift, esc
+	 *
+	 * @private
+	 * @param {Object} [ua] An object with a 'userAgent' and 'platform' property.
+	 * @return {Array} Array with 0 or more of the string values: ctrl, option, alt, shift, esc
+	 */
+	function getAccessKeyModifiers( ua ) {
+		var profile, accessKeyModifiers;
+
+		// use cached prefix if possible
+		if ( !ua && cachedAccessKeyModifiers ) {
+			return cachedAccessKeyModifiers;
+		}
 
-	var profile = $.client.profile( ua ),
+		profile = $.client.profile( ua );
 		accessKeyModifiers = [ 'alt' ];
 
-	// Classic Opera on any platform
-	if ( profile.name === 'opera' && profile.versionNumber < 15 ) {
-		accessKeyModifiers = [ 'shift', 'esc' ];
-
-	// Chrome and modern Opera on any platform
-	} else if ( profile.name === 'chrome' || profile.name === 'opera' ) {
-		accessKeyModifiers = (
-			profile.platform === 'mac'
-				// Chrome on Mac
-				? [ 'ctrl', 'option' ]
-				// Chrome on Windows or Linux
-				// (both alt- and alt-shift work, but alt with E, D, F etc does not
-				// work since they are browser shortcuts)
-				: [ 'alt', 'shift' ]
-		);
-
-	// Non-Windows Safari with webkit_version > 526
-	} else if ( profile.platform !== 'win'
-		&& profile.name === 'safari'
-		&& profile.layoutVersion > 526
-	) {
-		accessKeyModifiers = [ 'ctrl', 'alt' ];
-
-	// Safari/Konqueror on any platform, or any browser on Mac
-	// (but not Safari on Windows)
-	} else if ( !( profile.platform === 'win' && profile.name === 'safari' )
-		&& ( profile.name === 'safari'
-		|| profile.platform === 'mac'
-		|| profile.name === 'konqueror' )
-	) {
-		accessKeyModifiers = [ 'ctrl' ];
-
-	// Firefox/Iceweasel 2.x and later
-	} else if ( ( profile.name === 'firefox' || profile.name === 'iceweasel' )
-		&& profile.versionBase > '1'
-	) {
-		accessKeyModifiers = [ 'alt', 'shift' ];
-	}
+		// Classic Opera on any platform
+		if ( profile.name === 'opera' && profile.versionNumber < 15 ) {
+			accessKeyModifiers = [ 'shift', 'esc' ];
+
+		// Chrome and modern Opera on any platform
+		} else if ( profile.name === 'chrome' || profile.name === 'opera' ) {
+			accessKeyModifiers = (
+				profile.platform === 'mac' ?
+					// Chrome on Mac
+					[ 'ctrl', 'option' ] :
+					// Chrome on Windows or Linux
+					// (both alt- and alt-shift work, but alt with E, D, F etc does not
+					// work since they are browser shortcuts)
+					[ 'alt', 'shift' ]
+			);
+
+		// Non-Windows Safari with webkit_version > 526
+		} else if ( profile.platform !== 'win' &&
+			profile.name === 'safari' &&
+			profile.layoutVersion > 526
+		) {
+			accessKeyModifiers = [ 'ctrl', 'alt' ];
+
+		// Safari/Konqueror on any platform, or any browser on Mac
+		// (but not Safari on Windows)
+		} else if (
+			!( profile.platform === 'win' && profile.name === 'safari' ) &&
+			(
+				profile.name === 'safari' ||
+				profile.platform === 'mac' ||
+				profile.name === 'konqueror'
+			)
+		) {
+			accessKeyModifiers = [ 'ctrl' ];
+
+		// Firefox/Iceweasel 2.x and later
+		} else if (
+			( profile.name === 'firefox' || profile.name === 'iceweasel' ) &&
+			profile.versionBase > '1'
+		) {
+			accessKeyModifiers = [ 'alt', 'shift' ];
+		}
 
-	// cache modifiers
-	if ( !ua ) {
-		cachedAccessKeyModifiers = accessKeyModifiers;
+		// cache modifiers
+		if ( !ua ) {
+			cachedAccessKeyModifiers = accessKeyModifiers;
+		}
+		return accessKeyModifiers;
 	}
-	return accessKeyModifiers;
-}
 
-/**
- * Get the access key label for an element.
- *
- * Will use native accessKeyLabel if available (currently only in Firefox 8+),
- * falls back to #getAccessKeyModifiers.
- *
- * @private
- * @param {HTMLElement} element Element to get the label for
- * @return {string} Access key label
- */
-function getAccessKeyLabel( element ) {
-	// abort early if no access key
-	if ( !element.accessKey ) {
-		return '';
-	}
-	// use accessKeyLabel if possible
-	// https://html.spec.whatwg.org/multipage/interaction.html#dom-accesskeylabel
-	if ( !useTestPrefix && element.accessKeyLabel ) {
-		return element.accessKeyLabel;
+	/**
+	 * Get the access key label for an element.
+	 *
+	 * Will use native accessKeyLabel if available (currently only in Firefox 8+),
+	 * falls back to #getAccessKeyModifiers.
+	 *
+	 * @private
+	 * @param {HTMLElement} element Element to get the label for
+	 * @return {string} Access key label
+	 */
+	function getAccessKeyLabel( element ) {
+		// abort early if no access key
+		if ( !element.accessKey ) {
+			return '';
+		}
+		// use accessKeyLabel if possible
+		// https://html.spec.whatwg.org/multipage/interaction.html#dom-accesskeylabel
+		if ( !useTestPrefix && element.accessKeyLabel ) {
+			return element.accessKeyLabel;
+		}
+		return ( useTestPrefix ? 'test' : getAccessKeyModifiers().join( '-' ) ) + '-' + element.accessKey;
 	}
-	return ( useTestPrefix ? 'test' : getAccessKeyModifiers().join( '-' ) ) + '-' + element.accessKey;
-}
-
-/**
- * Update the title for an element (on the element with the access key or it's label) to show
- * the correct access key label.
- *
- * @private
- * @param {HTMLElement} element Element with the accesskey
- * @param {HTMLElement} titleElement Element with the title to update (may be the same as `element`)
- */
-function updateTooltipOnElement( element, titleElement ) {
-	var oldTitle, parts, regexp, newTitle, accessKeyLabel;
 
-	oldTitle = titleElement.title;
-	if ( !oldTitle ) {
-		// don't add a title if the element didn't have one before
-		return;
-	}
+	/**
+	 * Update the title for an element (on the element with the access key or it's label) to show
+	 * the correct access key label.
+	 *
+	 * @private
+	 * @param {HTMLElement} element Element with the accesskey
+	 * @param {HTMLElement} titleElement Element with the title to update (may be the same as `element`)
+	 */
+	function updateTooltipOnElement( element, titleElement ) {
+		var oldTitle, parts, regexp, newTitle, accessKeyLabel;
+
+		oldTitle = titleElement.title;
+		if ( !oldTitle ) {
+			// don't add a title if the element didn't have one before
+			return;
+		}
 
-	parts = ( mw.msg( 'word-separator' ) + mw.msg( 'brackets' ) ).split( '$1' );
-	regexp = new RegExp( $.map( parts, mw.RegExp.escape ).join( '.*?' ) + '$' );
-	newTitle = oldTitle.replace( regexp, '' );
-	accessKeyLabel = getAccessKeyLabel( element );
+		parts = ( mw.msg( 'word-separator' ) + mw.msg( 'brackets' ) ).split( '$1' );
+		regexp = new RegExp( $.map( parts, mw.RegExp.escape ).join( '.*?' ) + '$' );
+		newTitle = oldTitle.replace( regexp, '' );
+		accessKeyLabel = getAccessKeyLabel( element );
 
-	if ( accessKeyLabel ) {
-		// Should be build the same as in Linker::titleAttrib
-		newTitle += mw.msg( 'word-separator' ) + mw.msg( 'brackets', accessKeyLabel );
-	}
-	if ( oldTitle !== newTitle ) {
-		titleElement.title = newTitle;
+		if ( accessKeyLabel ) {
+			// Should be build the same as in Linker::titleAttrib
+			newTitle += mw.msg( 'word-separator' ) + mw.msg( 'brackets', accessKeyLabel );
+		}
+		if ( oldTitle !== newTitle ) {
+			titleElement.title = newTitle;
+		}
 	}
-}
 
-/**
- * Update the title for an element to show the correct access key label.
- *
- * @private
- * @param {HTMLElement} element Element with the accesskey
- */
-function updateTooltip( element ) {
-	var id, $element, $label, $labelParent;
-	updateTooltipOnElement( element, element );
-
-	// update associated label if there is one
-	$element = $( element );
-	if ( $element.is( labelable ) ) {
-		// Search it using 'for' attribute
-		id = element.id.replace( /"/g, '\\"' );
-		if ( id ) {
-			$label = $( 'label[for="' + id + '"]' );
-			if ( $label.length === 1 ) {
-				updateTooltipOnElement( element, $label[ 0 ] );
+	/**
+	 * Update the title for an element to show the correct access key label.
+	 *
+	 * @private
+	 * @param {HTMLElement} element Element with the accesskey
+	 */
+	function updateTooltip( element ) {
+		var id, $element, $label, $labelParent;
+		updateTooltipOnElement( element, element );
+
+		// update associated label if there is one
+		$element = $( element );
+		if ( $element.is( labelable ) ) {
+			// Search it using 'for' attribute
+			id = element.id.replace( /"/g, '\\"' );
+			if ( id ) {
+				$label = $( 'label[for="' + id + '"]' );
+				if ( $label.length === 1 ) {
+					updateTooltipOnElement( element, $label[ 0 ] );
+				}
 			}
-		}
 
-		// Search it as parent, because the form control can also be inside the label element itself
-		$labelParent = $element.parents( 'label' );
-		if ( $labelParent.length === 1 ) {
-			updateTooltipOnElement( element, $labelParent[ 0 ] );
+			// Search it as parent, because the form control can also be inside the label element itself
+			$labelParent = $element.parents( 'label' );
+			if ( $labelParent.length === 1 ) {
+				updateTooltipOnElement( element, $labelParent[ 0 ] );
+			}
 		}
 	}
-}
-
-/**
- * Update the titles for all elements in a jQuery selection.
- *
- * @return {jQuery}
- * @chainable
- */
-$.fn.updateTooltipAccessKeys = function () {
-	return this.each( function () {
-		updateTooltip( this );
-	} );
-};
 
-/**
- * getAccessKeyModifiers
- *
- * @method updateTooltipAccessKeys_getAccessKeyModifiers
- * @inheritdoc #getAccessKeyModifiers
- */
-$.fn.updateTooltipAccessKeys.getAccessKeyModifiers = getAccessKeyModifiers;
-
-/**
- * getAccessKeyLabel
- *
- * @method updateTooltipAccessKeys_getAccessKeyLabel
- * @inheritdoc #getAccessKeyLabel
- */
-$.fn.updateTooltipAccessKeys.getAccessKeyLabel = getAccessKeyLabel;
-
-/**
- * getAccessKeyPrefix
- *
- * @method updateTooltipAccessKeys_getAccessKeyPrefix
- * @deprecated since 1.27 Use #getAccessKeyModifiers
- */
-$.fn.updateTooltipAccessKeys.getAccessKeyPrefix = function ( ua ) {
-	return getAccessKeyModifiers( ua ).join( '-' ) + '-';
-};
-
-/**
- * Switch test mode on and off.
- *
- * @method updateTooltipAccessKeys_setTestMode
- * @param {boolean} mode New mode
- */
-$.fn.updateTooltipAccessKeys.setTestMode = function ( mode ) {
-	useTestPrefix = mode;
-};
-
-/**
- * @class jQuery
- * @mixins jQuery.plugin.accessKeyLabel
- */
+	/**
+	 * Update the titles for all elements in a jQuery selection.
+	 *
+	 * @return {jQuery}
+	 * @chainable
+	 */
+	$.fn.updateTooltipAccessKeys = function () {
+		return this.each( function () {
+			updateTooltip( this );
+		} );
+	};
+
+	/**
+	 * getAccessKeyModifiers
+	 *
+	 * @method updateTooltipAccessKeys_getAccessKeyModifiers
+	 * @inheritdoc #getAccessKeyModifiers
+	 */
+	$.fn.updateTooltipAccessKeys.getAccessKeyModifiers = getAccessKeyModifiers;
+
+	/**
+	 * getAccessKeyLabel
+	 *
+	 * @method updateTooltipAccessKeys_getAccessKeyLabel
+	 * @inheritdoc #getAccessKeyLabel
+	 */
+	$.fn.updateTooltipAccessKeys.getAccessKeyLabel = getAccessKeyLabel;
+
+	/**
+	 * getAccessKeyPrefix
+	 *
+	 * @method updateTooltipAccessKeys_getAccessKeyPrefix
+	 * @deprecated since 1.27 Use #getAccessKeyModifiers
+	 * @param {Object} [ua] An object with a 'userAgent' and 'platform' property.
+	 * @return {string}
+	 */
+	$.fn.updateTooltipAccessKeys.getAccessKeyPrefix = function ( ua ) {
+		return getAccessKeyModifiers( ua ).join( '-' ) + '-';
+	};
+
+	/**
+	 * Switch test mode on and off.
+	 *
+	 * @method updateTooltipAccessKeys_setTestMode
+	 * @param {boolean} mode New mode
+	 */
+	$.fn.updateTooltipAccessKeys.setTestMode = function ( mode ) {
+		useTestPrefix = mode;
+	};
+
+	/**
+	 * @class jQuery
+	 * @mixins jQuery.plugin.accessKeyLabel
+	 */
 
 }( jQuery, mediaWiki ) );