X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=resources%2Fsrc%2Fjquery%2Fjquery.highlightText.js;h=7205620c14cc623b4cdccba01302e6af59507067;hb=b5f06bbd12193e3f4dfa00342f882de8afb72c52;hp=3feca81cc1bbc75d7819f1bf2d1ca7727bff670d;hpb=24344400bb218ac621792be95f4ac83bdfc2879c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/resources/src/jquery/jquery.highlightText.js b/resources/src/jquery/jquery.highlightText.js
index 3feca81cc1..7205620c14 100644
--- a/resources/src/jquery/jquery.highlightText.js
+++ b/resources/src/jquery/jquery.highlightText.js
@@ -3,32 +3,42 @@
  * TODO: Add a function for restoring the previous text.
  * TODO: Accept mappings for converting shortcuts like WP: to Wikipedia:.
  */
-( function ( $, mw ) {
+( function () {
 
 	$.highlightText = {
 
 		// Split our pattern string at spaces and run our highlight function on the results
-		splitAndHighlight: function ( node, pat ) {
+		splitAndHighlight: function ( node, text ) {
 			var i,
-				patArray = pat.split( ' ' );
-			for ( i = 0; i < patArray.length; i++ ) {
-				if ( patArray[ i ].length === 0 ) {
+				words = text.split( ' ' );
+			for ( i = 0; i < words.length; i++ ) {
+				if ( words[ i ].length === 0 ) {
 					continue;
 				}
-				$.highlightText.innerHighlight( node, patArray[ i ] );
+				$.highlightText.innerHighlight(
+					node,
+					new RegExp( '(^|\\s)' + mw.RegExp.escape( words[ i ] ), 'i' )
+				);
 			}
 			return node;
 		},
 
+		prefixHighlight: function ( node, prefix ) {
+			$.highlightText.innerHighlight(
+				node,
+				new RegExp( '(^)' + mw.RegExp.escape( prefix ), 'i' )
+			);
+		},
+
 		// scans a node looking for the pattern and wraps a span around each match
 		innerHighlight: function ( node, pat ) {
 			var i, match, pos, spannode, middlebit, middleclone;
 			if ( node.nodeType === Node.TEXT_NODE ) {
 				// TODO - need to be smarter about the character matching here.
-				// non latin characters can make regex think a new word has begun: do not use \b
+				// non Latin characters can make regex think a new word has begun: do not use \b
 				// http://stackoverflow.com/questions/3787072/regex-wordwrap-with-utf8-characters-in-js
 				// look for an occurrence of our pattern and store the starting position
-				match = node.data.match( new RegExp( '(^|\\s)' + mw.RegExp.escape( pat ), 'i' ) );
+				match = node.data.match( pat );
 				if ( match ) {
 					pos = match.index + match[ 1 ].length; // include length of any matched spaces
 					// create the span wrapper for the matched text
@@ -37,7 +47,7 @@
 					// shave off the characters preceding the matched text
 					middlebit = node.splitText( pos );
 					// shave off any unmatched text off the end
-					middlebit.splitText( pat.length );
+					middlebit.splitText( match[ 0 ].length - match[ 1 ].length );
 					// clone for appending to our span
 					middleclone = middlebit.cloneNode( true );
 					// append the matched text node to the span
@@ -63,12 +73,25 @@
 		}
 	};
 
-	$.fn.highlightText = function ( matchString ) {
+	/**
+	 * Highlight certain text in current nodes (by wrapping it in `<span class="highlight">...</span>`).
+	 *
+	 * @param {string} matchString String to match
+	 * @param {Object} [options]
+	 * @param {string} [options.method='splitAndHighlight'] Method of matching to use, one of:
+	 *   - 'splitAndHighlight': Split `matchString` on spaces, then match each word separately.
+	 *   - 'prefixHighlight': Match `matchString` at the beginning of text only.
+	 * @return {jQuery}
+	 * @chainable
+	 */
+	$.fn.highlightText = function ( matchString, options ) {
+		options = options || {};
+		options.method = options.method || 'splitAndHighlight';
 		return this.each( function () {
 			var $el = $( this );
 			$el.data( 'highlightText', { originalText: $el.text() } );
-			$.highlightText.splitAndHighlight( this, matchString );
+			$.highlightText[ options.method ]( this, matchString );
 		} );
 	};
 
-}( jQuery, mediaWiki ) );
+}() );