Adding condition to don't apply 'center' in case of setting inline offset value

Amitesh · Amitesh · commit 326fcfc8116b · 2011-07-14T08:42:16.000-07:00
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -29,7 +29,7 @@
 			position: ['top', 'center'], 
 			offset: [0, 0],
 			relative: false,
-			calculateInlineOffset: false,
+			calculateInlineOffset: false, //If need to handle multilines inline elements
 			cancelDefault: true,
 
 			// type to event mapping 
@@ -79,48 +79,53 @@
 	};   
 
 		
-	/* calculate tip position relative to the trigger */  	
-	function getPosition(trigger, tip, conf) {	
+	/* calculate tip position relative to the trigger */    
+	function getPosition(trigger, tip, conf) {  
 
-		
-		// get origin top/left position 
-		var top = conf.relative ? trigger.position().top : trigger.offset().top, 
-			 left = conf.relative ? trigger.position().left : trigger.offset().left,
-			 pos = conf.position[0];
-		
-		//If relative is false and calculateInlineOffset flag is on then only go for it.
-		if (!conf.relative && conf.calculateInlineOffset) {
-			//Get the actual inline offset of triggered elem
-			var iOffset = $(trigger).inlineOffset();
-			
-			//If element is spans multilines then compare the left positions.  
-			if (left < iOffset.left){
-				left = iOffset.left;
-			}
-		}
+	    
+	    // get origin top/left position 
+	    var top = conf.relative ? trigger.position().top : trigger.offset().top, 
+	       left = conf.relative ? trigger.position().left : trigger.offset().left,
+	       pos = conf.position[0];
+	    
+	    var orgLeftOffset = left; //Keeping original offset
+	    top  -= tip.outerHeight() - conf.offset[0];
+	    left += trigger.outerWidth() + conf.offset[1];
+	    
+	    var isInlineOffsetSet = false;
+	    //If relative is false and calculateInlineOffset flag is on then only go for it.
+	    if (!conf.relative && conf.calculateInlineOffset) {
+	      //Get the actual inline offset of triggered elem
+	      var iOffset = $(trigger).inlineOffset();
 
-		top  -= tip.outerHeight() - conf.offset[0];
-		left += trigger.outerWidth() + conf.offset[1];
-		
-		// iPad position fix
-		if (/iPad/i.test(navigator.userAgent)) {
-			top -= $(window).scrollTop();
-		}
-		
-		// adjust Y		
-		var height = tip.outerHeight() + trigger.outerHeight();
-		if (pos == 'center') 	{ top += height / 2; }
-		if (pos == 'bottom') 	{ top += height; }
-		
-		
-		// adjust X
-		pos = conf.position[1]; 	
-		var width = tip.outerWidth() + trigger.outerWidth();
-		if (pos == 'center') 	{ left -= width / 2; }
-		if (pos == 'left')   	{ left -= width; }	 
-		
-		return {top: top, left: left};
-	}		
+	      //If element is spans multilines then compare the left positions.  
+	      if (orgLeftOffset < iOffset.left){
+	        left = iOffset.left;
+	        isInlineOffsetSet = true;
+	      }
+	    }
+	    
+	    // iPad position fix
+	    if (/iPad/i.test(navigator.userAgent)) {
+	      top -= $(window).scrollTop();
+	    }
+	    
+	    // adjust Y   
+	    var height = tip.outerHeight() + trigger.outerHeight();
+	    if (pos == 'center')  { top += height / 2; }
+	    if (pos == 'bottom')  { top += height; }
+	    
+	    
+	    // adjust X
+	    pos = conf.position[1];   
+	    var width = tip.outerWidth() + trigger.outerWidth();
+	    
+	    //don't apply 'center' in case of setting inline offset value
+	    if (pos == 'center' && !isInlineOffsetSet)  { left -= width / 2;} 
+	    if (pos == 'left')    { left -= width; }   
+	    
+	    return {top: top, left: left};
+	  }		
 
 	
 	
