1 files changed, 45 insertions, 33 deletions

diff --git a/resources/jquery/jquery.autoEllipsis.js b/resources/jquery/jquery.autoEllipsis.js
index 4993118d..7d726894 100644
--- a/resources/jquery/jquery.autoEllipsis.js
+++ b/resources/jquery/jquery.autoEllipsis.js
@@ -3,9 +3,9 @@
  */
 ( function( $ ) {
 
-// Cache ellipsed substrings for every string-width combination
+// Cache ellipsed substrings for every string-width-position combination
 var cache = { };
-// Use a seperate cache when match highlighting is enabled
+// Use a separate cache when match highlighting is enabled
 var matchTextCache = { };
 
 $.fn.autoEllipsis = function( options ) {
@@ -17,29 +17,29 @@ $.fn.autoEllipsis = function( options ) {
 		'matchText': null
 	}, options );
 	$(this).each( function() {
-		var $this = $(this);
+		var $el = $(this);
 		if ( options.restoreText ) {
-			if ( ! $this.data( 'autoEllipsis.originalText' ) ) {
-				$this.data( 'autoEllipsis.originalText', $this.text() );
+			if ( !$el.data( 'autoEllipsis.originalText' ) ) {
+				$el.data( 'autoEllipsis.originalText', $el.text() );
 			} else {
-				$this.text( $this.data( 'autoEllipsis.originalText' ) );
+				$el.text( $el.data( 'autoEllipsis.originalText' ) );
 			}
 		}
 		
 		// container element - used for measuring against
-		var $container = $this;
+		var $container = $el;
 		// trimmable text element - only the text within this element will be trimmed
 		var $trimmableText = null;
 		// protected text element - the width of this element is counted, but next is never trimmed from it
 		var $protectedText = null;
 
 		if ( options.hasSpan ) {
-			$trimmableText = $this.children( options.selector );
+			$trimmableText = $el.children( options.selector );
 		} else {
 			$trimmableText = $( '<span />' )
 				.css( 'whiteSpace', 'nowrap' )
-				.text( $this.text() );
-			$this
+				.text( $el.text() );
+			$el
 				.empty()
 				.append( $trimmableText );
 		}
@@ -49,27 +49,39 @@ $.fn.autoEllipsis = function( options ) {
 		var w = $container.width();
 		var pw = $protectedText ? $protectedText.width() : 0;
 		// Try cache
-		if ( !( text in cache ) ) {
-			cache[text] = {};
-		}
-		if ( options.matchText && !( text in matchTextCache ) ) {
-			matchTextCache[text] = {};
-		}
-		if ( options.matchText && !( options.matchText in matchTextCache[text] ) ) {
-			matchTextCache[text][options.matchText] = {};
-		}
-		if ( !options.matchText && w in cache[text] ) {
-			$container.html( cache[text][w] );
-			if ( options.tooltip )
-				$container.attr( 'title', text );
-			return;
-		}
-		if( options.matchText && options.matchText in matchTextCache[text] && w in matchTextCache[text][options.matchText] ) {
-			$container.html( matchTextCache[text][options.matchText][w] );
-			if ( options.tooltip )
-				$container.attr( 'title', text );
-			return;
+		if ( options.matchText ) {
+			if ( !( text in matchTextCache ) ) {
+				matchTextCache[text] = {};
+			}
+			if ( !( options.matchText in matchTextCache[text] ) ) {
+				matchTextCache[text][options.matchText] = {};
+			}
+			if ( !( w in matchTextCache[text][options.matchText] ) ) {
+				matchTextCache[text][options.matchText][w] = {};
+			}
+			if ( options.position in matchTextCache[text][options.matchText][w] ) {
+				$container.html( matchTextCache[text][options.matchText][w][options.position] );
+				if ( options.tooltip ) {
+					$container.attr( 'title', text );
+				}
+				return;
+			}
+		} else {
+			if ( !( text in cache ) ) {
+				cache[text] = {};
+			}
+			if ( !( w in cache[text] ) ) {
+				cache[text][w] = {};
+			}
+			if ( options.position in cache[text][w] ) {
+				$container.html( cache[text][w][options.position] );
+				if ( options.tooltip ) {
+					$container.attr( 'title', text );
+				}
+				return;
+			}
 		}
+		
 		if ( $trimmableText.width() + pw > w ) {
 			switch ( options.position ) {
 				case 'right':
@@ -94,7 +106,7 @@ $.fn.autoEllipsis = function( options ) {
 					while ( $trimmableText.outerWidth() + pw > w  && i[0] > 0 ) {
 						$trimmableText.text( trimmableText.substr( 0, i[0] ) + '...' + trimmableText.substr( i[1] ) );
 						// Alternate between trimming the end and begining
-						if ( side == 0 ) {
+						if ( side === 0 ) {
 							// Make the begining shorter
 							i[0]--;
 							side = 1;
@@ -120,9 +132,9 @@ $.fn.autoEllipsis = function( options ) {
 		}
 		if ( options.matchText ) {
 			$container.highlightText( options.matchText );
-			matchTextCache[text][options.matchText][w] = $container.html();
+			matchTextCache[text][options.matchText][w][options.position] = $container.html();
 		} else {
-			cache[text][w] = $container.html();
+			cache[text][w][options.position] = $container.html();
 		}
 		
 	} );