Merge branch 'dev'

edobry · edobry · commit e59418e72a26 · 2012-11-02T00:25:12.000-04:00
diff --git a/src/dateinput/dateinput.js b/src/dateinput/dateinput.js
@@ -289,7 +289,12 @@
 		
 //{{{ pick
 			 			 
-		function select(date, conf, e) {  
+		function select(date, conf, e) {
+			// If it is readonly, then we'll just close the calendar
+			if (input.attr('readonly')) {
+				self.hide(e);
+				return;
+			}
 			
 			// current value
 			value 	 = date;
@@ -402,7 +407,7 @@
 			$(document).on("click.d", function(e) {					
 				var el = e.target;
 				
-				if (!$(el).parents("#" + css.root).length && el != input[0] && (!trigger || el != trigger[0])) {
+				if (!(el.id == css.root || $(el).parents("#" + css.root).length) && el != input[0] && (!trigger || el != trigger[0])) {
 					self.hide(e);
 				}
 				
@@ -420,7 +425,7 @@
 			*/					
 			show: function(e) {
 				
-				if (input.attr("readonly") || input.attr("disabled") || opened) { return; }
+				if (input.attr("disabled") || opened) { return; }
 				
 				// onBeforeShow
 				e = e || $.Event();
diff --git a/src/toolbox/toolbox.expose.js b/src/toolbox/toolbox.expose.js
@@ -169,12 +169,12 @@
 				// onBeforeClose
 				if (call(config.onBeforeClose) === false) { return this; }
 					
-				mask.fadeOut(config.closeSpeed, function()  {					
-					call(config.onClose);					
+				mask.fadeOut(config.closeSpeed, function()  {										
 					if (exposed) {
 						exposed.css({zIndex: overlayIndex});						
 					}				
 					loaded = false;
+					call(config.onClose);
 				});				
 				
 				// unbind various event listeners
diff --git a/src/tooltip/tooltip.dynamic.js b/src/tooltip/tooltip.dynamic.js
@@ -67,8 +67,8 @@
 		
 		var confOrigin = $.extend(true,{},conf),
 		    cls = conf.classNames.split(/\s/), 
-		    orig;
-			
+		    orig, ret;
+	
 		this.each(function() {		
 				
 			var api = $(this).tooltip().onBeforeShow(function(e, pos) {				
diff --git a/src/tooltip/tooltip.js b/src/tooltip/tooltip.js
@@ -100,23 +100,23 @@
 			 left = conf.relative ? trigger.position().left : trigger.offset().left,
 			 pos = conf.position[0];
 
-		top  -= tip.outerHeight() - conf.offset[0];
-		left += trigger.outerWidth() + conf.offset[1];
+		top  -= tip.outerHeight(false) - conf.offset[0];
+		left += trigger.outerWidth(false) + conf.offset[1];
 		
 		// iPad position fix
 		if (/iPad/i.test(navigator.userAgent)) {
 			top -= $(window).scrollTop();
 		}
 		
 		// adjust Y		
-		var height = tip.outerHeight() + trigger.outerHeight();
+		var height = tip.outerHeight(false) + trigger.outerHeight(false);
 		if (pos == 'center') 	{ top += height / 2; }
 		if (pos == 'bottom') 	{ top += height; }
 		
 		
 		// adjust X
 		pos = conf.position[1]; 	
-		var width = tip.outerWidth() + trigger.outerWidth();
+		var width = tip.outerWidth(false) + trigger.outerWidth(false);
 		if (pos == 'center') 	{ left -= width / 2; }
 		if (pos == 'left')   	{ left -= width; }	 
 		
@@ -203,7 +203,8 @@
 
 					// manual tooltip
 					} else {	
-						tip = trigger.next();  
+						tip = trigger.find('.' + conf.tipClass);
+						if (!tip.length) { tip = trigger.next(); }
 						if (!tip.length) { tip = trigger.parent().next(); } 	 
 					}
 					
@@ -331,10 +332,6 @@
 	
 	// jQuery plugin implementation
 	$.fn.tooltip = function(conf) {
-		
-		// return existing instance
-		var api = this.data("tooltip");
-		if (api) { return api; }
 
 		conf = $.extend(true, {}, $.tools.tooltip.conf, conf);
 		
@@ -344,9 +341,12 @@
 		}
 		
 		// install tooltip for each entry in jQuery object
+		// that is not an existing instance
 		this.each(function() {
-			api = new Tooltip($(this), conf); 
-			$(this).data("tooltip", api); 
+			if ( $(this).data("tooltip")===null){
+			    api = new Tooltip($(this), conf);
+			    $(this).data("tooltip", api);
+			};
 		});
 		
 		return conf.api ? api: this;		 
diff --git a/test/tooltip/index.html b/test/tooltip/index.html
@@ -107,6 +107,39 @@ <h3>Manual tooltip</h3>
 	
 </div>
 
+<div id="manual-enclosed" class="test">
+
+	<h3>Manual enclosed tooltip</h3>
+		
+	<table>
+		<tbody>
+			<tr>
+				<td class="trigger">
+					trigger 1
+					<div class="tooltip">Manual enclosed #1</div>
+				</td>
+				<td class="trigger">
+					trigger 2
+					<div class="tooltip">Manual enclosed #2</div>
+				</td>
+				<td class="trigger">
+					trigger 3
+					<div class="tooltip">Manual enclosed #3</div>
+				</td>
+			</tr>
+		</tbody>
+	</table>
+	
+	<script>
+		$("#manual-enclosed td").tooltip({ 
+			delay: 300, 
+			predelay: 0,
+			effect: 'fade'
+		});
+	</script>
+	
+</div>
+
 <div id="same" class="test">
 
 	<h3>Same tip element</h3>
