jquery-qtip2-rails 0.3.0 → 0.4.0

data/README.md

@@ -58,7 +58,7 @@ You can also create your own `app/assets/javascripts/jquery.qtip.js` file:
     //= include jquery-qtip/src/modal/modal.js
     //= include jquery-qtip/src/viewport/viewport.js
     //= include jquery-qtip/src/imagemap/imagemap.js
-    //= include jquery-qtip/src/bgiframe/bgiframe.js
+    //= include jquery-qtip/src/ie6/ie6.js
     //= include jquery-qtip/src/outro.js
 
 And `app/assets/stylesheets/jquery.qtip.css` file:
@@ -69,6 +69,7 @@ And `app/assets/stylesheets/jquery.qtip.css` file:
      *= include jquery-qtip/src/css3.css
      *= include jquery-qtip/src/tips/tips.css
      *= include jquery-qtip/src/modal/modal.css
+     *= include jquery-qtip/src/ie6/ie6.css
     */
 
 This allows you to enable only the plugins that you need and thus reduce qTip2 size.
@@ -88,12 +89,14 @@ qTip2 includes a [Twitter Bootstrap theme](http://craigsworks.com/projects/qtip2
 
 How to use:
 
-    $('.selector').qtip({
-      content: 'Hello World!'
-      style: {
-        classes: 'ui-tooltip-bootstrap'
-      }
-    })
+```JavaScript
+$('.selector').qtip({
+  content: 'Hello World!'
+  style: {
+    classes: 'qtip-bootstrap'
+  }
+})
+```
 
 ## License
 

data/lib/jquery-qtip2-rails/version.rb

@@ -1,7 +1,7 @@
 module Jquery
   module Qtip2
     module Rails
-      VERSION = "0.3.0"
+      VERSION = "0.4.0"
     end
   end
 end

data/test/dummy/app/assets/javascripts/home.js

@@ -11,15 +11,15 @@ $(document).ready(function() {
     content: 'no_title'
   });
 
-  $('#ui-tooltip-rounded').qtip({
+  $('#qtip-rounded').qtip({
     position: { target: 'mouse', adjust: { x: 10,  y: 10 } },
-    content: 'ui-tooltip-rounded',
+    content: 'qtip-rounded',
     style: {
-      classes: 'ui-tooltip-rounded'
+      classes: 'qtip-rounded'
     }
   });
 
-  $('#ui-tooltip-bootstrap').qtip({
+  $('#qtip-bootstrap').qtip({
     position: {
       my: 'bottom center',
       at: 'top center',
@@ -29,20 +29,20 @@ $(document).ready(function() {
     content: {
       title: {
         button: 'close',
-        text: 'ui-tooltip-bootstrap'
+        text: 'qtip-bootstrap'
       },
-      text: 'ui-tooltip-bootstrap'
+      text: 'qtip-bootstrap'
     },
     style: {
-      classes: 'ui-tooltip-bootstrap'
+      classes: 'qtip-bootstrap'
     }
   });
 
-  $('#ui-tooltip-shadow-rounded').qtip({
+  $('#qtip-shadow-rounded').qtip({
     position: { target: 'mouse', adjust: { x: 10,  y: 10 } },
-    content: 'ui-tooltip-shadow ui-tooltip-rounded',
+    content: 'qtip-shadow qtip-rounded',
     style: {
-      classes: 'ui-tooltip-shadow ui-tooltip-rounded'
+      classes: 'qtip-shadow qtip-rounded'
     }
   });
 });

data/test/dummy/app/views/home/index.html.erb

@@ -7,8 +7,8 @@
 
 <li><div id="no_title">no_title</div></li>
 
-<li><div id="ui-tooltip-rounded">ui-tooltip-rounded</div></li>
+<li><div id="qtip-rounded">qtip-rounded</div></li>
 
-<li><div id="ui-tooltip-bootstrap">ui-tooltip-bootstrap</div></li>
+<li><div id="qtip-bootstrap">qtip-bootstrap</div></li>
 
-<li><div id="ui-tooltip-shadow-rounded">ui-tooltip-shadow ui-tooltip-rounded</div></li>
+<li><div id="qtip-shadow-rounded">qtip-shadow qtip-rounded</div></li>

data/vendor/assets/jquery-qtip/jquery-qtip/src/basic.css

@@ -1,103 +1,103 @@
 /*! Light tooltip style */
-.ui-tooltip-light{
+.qtip-light{
 	background-color: white;
 	border-color: #E2E2E2;
 	color: #454545;
 }
 
-	.ui-tooltip-light .ui-tooltip-titlebar{
+	.qtip-light .qtip-titlebar{
 		background-color: #f1f1f1;
 	}
 
 
 /*! Dark tooltip style */
-.ui-tooltip-dark{
+.qtip-dark{
 	background-color: #505050;
 	border-color: #303030;
 	color: #f3f3f3;
 }
 
-	.ui-tooltip-dark .ui-tooltip-titlebar{
+	.qtip-dark .qtip-titlebar{
 		background-color: #404040;
 	}
 
-	.ui-tooltip-dark .ui-tooltip-icon{
+	.qtip-dark .qtip-icon{
 		border-color: #444;
 	}
 
-	.ui-tooltip-dark .ui-tooltip-titlebar .ui-state-hover{
+	.qtip-dark .qtip-titlebar .ui-state-hover{
 		border-color: #303030;
 	}
 
 
 /*! Cream tooltip style */
-.ui-tooltip-cream{
+.qtip-cream{
 	background-color: #FBF7AA;
 	border-color: #F9E98E;
 	color: #A27D35;
 }
 
-	.ui-tooltip-cream .ui-tooltip-titlebar{
+	.qtip-cream .qtip-titlebar{
 		background-color: #F0DE7D;
 	}
 
-	.ui-tooltip-cream .ui-state-default .ui-tooltip-icon{
+	.qtip-cream .qtip-close .qtip-icon{
 		background-position: -82px 0;
 	}
 
 
 /*! Red tooltip style */
-.ui-tooltip-red{
+.qtip-red{
 	background-color: #F78B83;
 	border-color: #D95252;
 	color: #912323;
 }
 
-	.ui-tooltip-red .ui-tooltip-titlebar{
+	.qtip-red .qtip-titlebar{
 		background-color: #F06D65;
 	}
 
-	.ui-tooltip-red .ui-state-default .ui-tooltip-icon{
+	.qtip-red .qtip-close .qtip-icon{
 		background-position: -102px 0;
 	}
 
-	.ui-tooltip-red .ui-tooltip-icon{
+	.qtip-red .qtip-icon{
 		border-color: #D95252;
 	}
 
-	.ui-tooltip-red .ui-tooltip-titlebar .ui-state-hover{
+	.qtip-red .qtip-titlebar .ui-state-hover{
 		border-color: #D95252;
 	}
 
 
 /*! Green tooltip style */
-.ui-tooltip-green{
+.qtip-green{
 	background-color: #CAED9E;
 	border-color: #90D93F;
 	color: #3F6219;
 }
 
-	.ui-tooltip-green .ui-tooltip-titlebar{
+	.qtip-green .qtip-titlebar{
 		background-color: #B0DE78;
 	}
 
-	.ui-tooltip-green .ui-state-default .ui-tooltip-icon{
+	.qtip-green .qtip-close .qtip-icon{
 		background-position: -42px 0;
 	}
 
 
 /*! Blue tooltip style */
-.ui-tooltip-blue{
+.qtip-blue{
 	background-color: #E5F6FE;
 	border-color: #ADD9ED;
 	color: #5E99BD;
 }
 
-	.ui-tooltip-blue .ui-tooltip-titlebar{
+	.qtip-blue .qtip-titlebar{
 		background-color: #D0E9F5;
 	}
 
-	.ui-tooltip-blue .ui-state-default .ui-tooltip-icon{
+	.qtip-blue .qtip-close .qtip-icon{
 		background-position: -2px 0;
 	}
 

data/vendor/assets/jquery-qtip/jquery-qtip/src/core.css

@@ -1,22 +1,5 @@
-/* Fluid class for determining actual width in IE */
-#qtip-rcontainer{
-	position: absolute;
-	left: -28000px;
-	top: -28000px;
-	display: block;
-	visibility: hidden;
-}
-
-	/* Fluid class for determining actual width in IE */
-	#qtip-rcontainer .ui-tooltip{
-		display: block !important;
-		visibility: hidden !important;
-		position: static !important;
-		float: left !important;
-	}
-
 /* Core qTip styles */
-.ui-tooltip, .qtip{
+.qtip, .qtip{
 	position: absolute;
 	left: -28000px;
 	top: -28000px;
@@ -27,9 +10,11 @@
 	
 	font-size: 10.5px;
 	line-height: 12px;
+
+	direction: ltr;
 }
 
-	.ui-tooltip-content{
+	.qtip-content{
 		position: relative;
 		padding: 5px 9px;
 		overflow: hidden;
@@ -38,9 +23,8 @@
 		word-wrap: break-word;
 	}
 
-	.ui-tooltip-titlebar{
+	.qtip-titlebar{
 		position: relative;
-		min-height: 14px;
 		padding: 5px 35px 5px 10px;
 		overflow: hidden;
 
@@ -48,39 +32,44 @@
 		font-weight: bold;
 	}
 
-	.ui-tooltip-titlebar + .ui-tooltip-content{ border-top-width: 0 !important; }
+	.qtip-titlebar + .qtip-content{ border-top-width: 0 !important; }
 
-		/* Default close button class */
-		.ui-tooltip-titlebar .ui-state-default{
-			position: absolute;
-			right: 4px;
-			top: 50%;
-			margin-top: -9px;
+	/* Default close button class */
+	.qtip-close{
+		position: absolute;
+		right: -9px; top: -9px;
+
+		cursor: pointer;
+		outline: medium none;
 
-			cursor: pointer;
-			outline: medium none;
+		border-width: 1px;
+		border-style: solid;
+		border-color: transparent;
+	}
 
-			border-width: 1px;
-			border-style: solid;
+		.qtip-titlebar .qtip-close{
+			right: 4px; top: 50%;
+			margin-top: -9px;
 		}
-		
-		* html .ui-tooltip-titlebar .ui-state-default{ top: 16px; } /* IE fix */
+	
+		* html .qtip-titlebar .qtip-close{ top: 16px; } /* IE fix */
 
-		.ui-tooltip-titlebar .ui-icon,
-		.ui-tooltip-icon .ui-icon{
+		.qtip-titlebar .ui-icon,
+		.qtip-icon .ui-icon{
 			display: block;
 			text-indent: -1000em;
 			direction: ltr;
+			vertical-align: middle;
 		}
 
-		.ui-tooltip-icon, .ui-tooltip-icon .ui-icon{
+		.qtip-icon, .qtip-icon .ui-icon{
 			-moz-border-radius: 3px;
 			-webkit-border-radius: 3px;
 			border-radius: 3px;
 			text-decoration: none;
 		}
 
-			.ui-tooltip-icon .ui-icon{
+			.qtip-icon .ui-icon{
 				width: 18px;
 				height: 14px;
 
@@ -94,13 +83,13 @@
 
 
 /* Applied to 'focused' tooltips e.g. most recently displayed/interacted with */
-.ui-tooltip-focus{}
+.qtip-focus{}
 
 /* Applied on hover of tooltips i.e. added/removed on mouseenter/mouseleave respectively */
-.ui-tooltip-hover{}
+.qtip-hover{}
 
 /* Default tooltip style */
-.ui-tooltip-default{
+.qtip-default{
 	border-width: 1px;
 	border-style: solid;
 	border-color: #F1D031;
@@ -109,17 +98,17 @@
 	color: #555;
 }
 
-	.ui-tooltip-default .ui-tooltip-titlebar{
+	.qtip-default .qtip-titlebar{
 		background-color: #FFEF93;
 	}
 
-	.ui-tooltip-default .ui-tooltip-icon{
+	.qtip-default .qtip-icon{
 		border-color: #CCC;
 		background: #F1F1F1;
 		color: #777;
 	}
 	
-	.ui-tooltip-default .ui-tooltip-titlebar .ui-state-hover{
+	.qtip-default .qtip-titlebar .qtip-close{
 		border-color: #AAA;
 		color: #111;
 	}

data/vendor/assets/jquery-qtip/jquery-qtip/src/core.js

@@ -2,7 +2,7 @@
 function sanitizeOptions(opts)
 {
 	var invalid = function(a) { return a === NULL || 'object' !== typeof a; },
-		invalidContent = function(c) { return !$.isFunction(c) && ((!c && !c.attr) || c.length < 1 || ('object' === typeof c && !c.jquery)); };
+		invalidContent = function(c) { return !$.isFunction(c) && ((!c && !c.attr) || c.length < 1 || ('object' === typeof c && !c.jquery && !c.then)); };
 
 	if(!opts || 'object' !== typeof opts) { return FALSE; }
 
@@ -62,11 +62,12 @@ function QTip(target, options, id, attr)
 	// Declare this reference
 	var self = this,
 		docBody = document.body,
-		tooltipID = uitooltip + '-' + id,
+		tooltipID = NAMESPACE + '-' + id,
 		isPositioning = 0,
 		isDrawing = 0,
 		tooltip = $(),
 		namespace = '.qtip-' + id,
+		disabledClass = 'qtip-disabled',
 		elements, cache;
 
 	// Setup class attributes
@@ -87,9 +88,6 @@ function QTip(target, options, id, attr)
 		lastClass: ''
 	};
 
-	/*
-	* Private core functions
-	*/
 	function convertNotation(notation)
 	{
 		var i = 0, obj, option = options,
@@ -105,29 +103,30 @@ function QTip(target, options, id, attr)
 		return [obj || options, levels.pop()];
 	}
 
-	function triggerEvent(type, args, event) {
-		var callback = $.Event('tooltip'+type);
-		callback.originalEvent = (event ? $.extend({}, event) : NULL) || cache.event || NULL;
-		tooltip.trigger(callback, [self].concat(args || []));
-
-		return !callback.isDefaultPrevented();
+	function createWidgetClass(cls)
+	{
+		return widget.concat('').join(cls ? '-'+cls+' ' : ' ');
 	}
 
 	function setWidget()
 	{
-		var on = options.style.widget;
+		var on = options.style.widget,
+			disabled = tooltip.hasClass(disabledClass);
 
-		tooltip.toggleClass('ui-helper-reset '+widget, on).toggleClass(defaultClass, options.style.def && !on);
+		tooltip.removeClass(disabledClass);
+		disabledClass = on ? 'ui-state-disabled' : 'qtip-disabled';
+		tooltip.toggleClass(disabledClass, disabled);
 
+		tooltip.toggleClass('ui-helper-reset '+createWidgetClass(), on).toggleClass(defaultClass, options.style.def && !on);
+		
 		if(elements.content) {
-			elements.content.toggleClass(widget+'-content', on);
+			elements.content.toggleClass( createWidgetClass('content'), on);
 		}
-
 		if(elements.titlebar) {
-			elements.titlebar.toggleClass(widget+'-header', on);
+			elements.titlebar.toggleClass( createWidgetClass('header'), on);
 		}
 		if(elements.button) {
-			elements.button.toggleClass(uitooltip+'-icon', !on);
+			elements.button.toggleClass(NAMESPACE+'-icon', !on);
 		}
 	}
 
@@ -156,7 +155,7 @@ function QTip(target, options, id, attr)
 		}
 		else {
 			elements.button = $('<a />', {
-				'class': 'ui-state-default ui-tooltip-close ' + (options.style.widget ? '' : uitooltip+'-icon'),
+				'class': 'qtip-close ' + (options.style.widget ? '' : NAMESPACE+'-icon'),
 				'title': close,
 				'aria-label': close
 			})
@@ -169,15 +168,12 @@ function QTip(target, options, id, attr)
 		}
 
 		// Create button and setup attributes
-		elements.button.appendTo(elements.titlebar)
+		elements.button.appendTo(elements.titlebar || tooltip)
 			.attr('role', 'button')
 			.click(function(event) {
-				if(!tooltip.hasClass(disabled)) { self.hide(event); }
+				if(!tooltip.hasClass(disabledClass)) { self.hide(event); }
 				return FALSE;
 			});
-
-		// Redraw the tooltip when we're done
-		self.redraw();
 	}
 
 	function createTitle()
@@ -189,36 +185,32 @@ function QTip(target, options, id, attr)
 
 		// Create title bar and title elements
 		elements.titlebar = $('<div />', {
-			'class': uitooltip + '-titlebar ' + (options.style.widget ? 'ui-widget-header' : '')
+			'class': NAMESPACE + '-titlebar ' + (options.style.widget ? createWidgetClass('header') : '')
 		})
 		.append(
 			elements.title = $('<div />', {
 				'id': id,
-				'class': uitooltip + '-title',
+				'class': NAMESPACE + '-title',
 				'aria-atomic': TRUE
 			})
 		)
 		.insertBefore(elements.content)
 
 		// Button-specific events
-		.delegate('.ui-tooltip-close', 'mousedown keydown mouseup keyup mouseout', function(event) {
+		.delegate('.qtip-close', 'mousedown keydown mouseup keyup mouseout', function(event) {
 			$(this).toggleClass('ui-state-active ui-state-focus', event.type.substr(-4) === 'down');
 		})
-		.delegate('.ui-tooltip-close', 'mouseover mouseout', function(event){
+		.delegate('.qtip-close', 'mouseover mouseout', function(event){
 			$(this).toggleClass('ui-state-hover', event.type === 'mouseover');
 		});
 
 		// Create button if enabled
 		if(options.content.title.button) { createButton(); }
-
-		// Redraw the tooltip dimensions if it's rendered
-		else if(self.rendered){ self.redraw(); }
 	}
 
 	function updateButton(button)
 	{
-		var elem = elements.button,
-			title = elements.title;
+		var elem = elements.button;
 
 		// Make sure tooltip is rendered and if not, return
 		if(!self.rendered) { return FALSE; }
@@ -227,9 +219,6 @@ function QTip(target, options, id, attr)
 			elem.remove();
 		}
 		else {
-			if(!title) {
-				createTitle();
-			}
 			createButton();
 		}
 	}
@@ -257,14 +246,22 @@ function QTip(target, options, id, attr)
 		// Content is a regular string, insert the new content
 		else { elem.html(content); }
 
-		// Redraw and reposition
-		self.redraw();
+		// Reposition if rnedered
 		if(reposition !== FALSE && self.rendered && tooltip[0].offsetWidth > 0) {
 			self.reposition(cache.event);
 		}
 	}
 
-	function updateContent(content, reposition)
+	function deferredContent(deferred)
+	{
+		if(deferred && $.isFunction(deferred.done)) {
+			deferred.done(function(c) {
+				updateContent(c, null, FALSE);
+			});
+		}
+	}
+
+	function updateContent(content, reposition, checkDeferred)
 	{
 		var elem = elements.content;
 
@@ -276,6 +273,11 @@ function QTip(target, options, id, attr)
 			content = content.call(target, cache.event, self) || '';
 		}
 
+		// Handle deferred content
+		if(checkDeferred !== FALSE) {
+			deferredContent(options.content.deferred);
+		}
+
 		// Append new content if its a DOM array and show it if hidden
 		if(content.jquery && content.length > 0) {
 			elem.empty().append(content.css({ display: 'block' }));
@@ -298,7 +300,6 @@ function QTip(target, options, id, attr)
 
 				// If queue is empty after image removal, update tooltip and continue the queue
 				if($.isEmptyObject(srcs)) {
-					self.redraw();
 					if(reposition !== FALSE) {
 						self.reposition(cache.event);
 					}
@@ -370,7 +371,7 @@ function QTip(target, options, id, attr)
 		// Define show event method
 		function showMethod(event)
 		{
-			if(tooltip.hasClass(disabled)) { return FALSE; }
+			if(tooltip.hasClass(disabledClass)) { return FALSE; }
 
 			// Clear hide timers
 			clearTimeout(self.timers.show);
@@ -387,7 +388,7 @@ function QTip(target, options, id, attr)
 		// Define hide method
 		function hideMethod(event)
 		{
-			if(tooltip.hasClass(disabled) || isPositioning || isDrawing) { return FALSE; }
+			if(tooltip.hasClass(disabledClass) || isPositioning || isDrawing) { return FALSE; }
 
 			// Check if new target was actually the tooltip element
 			var relatedTarget = $(event.relatedTarget || event.target),
@@ -413,7 +414,7 @@ function QTip(target, options, id, attr)
 		// Define inactive method
 		function inactiveMethod(event)
 		{
-			if(tooltip.hasClass(disabled)) { return FALSE; }
+			if(tooltip.hasClass(disabledClass)) { return FALSE; }
 
 			// Clear timer
 			clearTimeout(self.timers.inactive);
@@ -452,7 +453,7 @@ function QTip(target, options, id, attr)
 
 			// Clear hide timer on tooltip hover to prevent it from closing
 			tooltip.bind('mouseover'+namespace, function() {
-				if(!tooltip.hasClass(disabled)) { clearTimeout(self.timers.hide); }
+				if(!tooltip.hasClass(disabledClass)) { clearTimeout(self.timers.hide); }
 			});
 		}
 
@@ -468,9 +469,9 @@ function QTip(target, options, id, attr)
 
 		// Hide tooltip on document mousedown if unfocus events are enabled
 		if(('' + options.hide.event).indexOf('unfocus') > -1) {
-			posOptions.container.closest('html').bind('mousedown'+namespace, function(event) {
+			posOptions.container.closest('html').bind('mousedown'+namespace+' touchstart'+namespace, function(event) {
 				var elem = $(event.target),
-					enabled = self.rendered && !tooltip.hasClass(disabled) && tooltip[0].offsetWidth > 0,
+					enabled = self.rendered && !tooltip.hasClass(disabledClass) && tooltip[0].offsetWidth > 0,
 					isAncestor = elem.parents(selector).filter(tooltip[0]).length > 0;
 
 				if(elem[0] !== target[0] && elem[0] !== tooltip[0] && !isAncestor &&
@@ -536,9 +537,7 @@ function QTip(target, options, id, attr)
 		// Mouse positioning events
 		if(posOptions.target === 'mouse') {
 			// Cache mousemove coords on show targets
-			targets.show.bind('mousemove'+namespace, function(event) {
-				MOUSE = { pageX: event.pageX, pageY: event.pageY, type: 'mousemove' };
-			});
+			targets.show.bind('mousemove'+namespace, storeMouse);
 
 			// If mouse adjustment is on...
 			if(posOptions.adjust.mouse) {
@@ -558,7 +557,7 @@ function QTip(target, options, id, attr)
 				// Update tooltip position on mousemove
 				targets.document.bind('mousemove'+namespace, function(event) {
 					// Update the tooltip position only if the tooltip is visible and adjustment is enabled
-					if(self.rendered && cache.onTarget && !tooltip.hasClass(disabled) && tooltip[0].offsetWidth > 0) {
+					if(self.rendered && cache.onTarget && !tooltip.hasClass(disabledClass) && tooltip[0].offsetWidth > 0) {
 						self.reposition(event || MOUSE);
 					}
 				});
@@ -570,10 +569,8 @@ function QTip(target, options, id, attr)
 			($.event.special.resize ? targets.viewport : targets.window).bind('resize'+namespace, repositionMethod);
 		}
 
-		// Adjust tooltip position on scroll if screen adjustment is enabled
-		if(targets.viewport.length || (IE6 && tooltip.css('position') === 'fixed')) {
-			targets.viewport.bind('scroll'+namespace, repositionMethod);
-		}
+		// Adjust tooltip position on scroll of the window or viewport element if present
+		targets.window.add(posOptions.container).bind('scroll'+namespace, repositionMethod);
 	}
 
 	function unassignEvents()
@@ -603,7 +600,7 @@ function QTip(target, options, id, attr)
 		// Core checks
 		'^id$': function(obj, o, v) {
 			var id = v === TRUE ? QTIP.nextid : v,
-				tooltipID = uitooltip + '-' + id;
+				tooltipID = NAMESPACE + '-' + id;
 
 			if(id !== FALSE && id.length > 0 && !$('#'+tooltipID).length) {
 				tooltip[0].id = tooltipID;
@@ -613,7 +610,8 @@ function QTip(target, options, id, attr)
 		},
 
 		// Content checks
-		'^content.text$': function(obj, o, v){ updateContent(v); },
+		'^content.text$': function(obj, o, v) { updateContent(options.content.text); },
+		'^content.deferred$': function(obj, o, v) { deferredContent(options.content.deferred); },
 		'^content.title.text$': function(obj, o, v) {
 			// Remove title if content is null
 			if(!v) { return removeTitle(); }
@@ -643,7 +641,10 @@ function QTip(target, options, id, attr)
 
 		// Style checks
 		'^style.classes$': function(obj, o, v) {
-			tooltip.attr('class', uitooltip + ' qtip ' + v);
+			tooltip.attr('class', NAMESPACE + ' qtip ' + v);
+		},
+		'^style.width|height': function(obj, o, v) {
+			tooltip.css(o, v);
 		},
 		'^style.widget|content.title': setWidget,
 
@@ -664,16 +665,28 @@ function QTip(target, options, id, attr)
 		}
 	};
 
-	/*
-	* Public API methods
-	*/
 	$.extend(self, {
+		/*
+		* Psuedo-private API methods
+		*/
+		_triggerEvent: function(type, args, event)
+		{
+			var callback = $.Event('tooltip'+type);
+			callback.originalEvent = (event ? $.extend({}, event) : NULL) || cache.event || NULL;
+			tooltip.trigger(callback, [self].concat(args || []));
+
+			return !callback.isDefaultPrevented();
+		},
+
+		/*
+		* Public API methods
+		*/
 		render: function(show)
 		{
 			if(self.rendered) { return self; } // If tooltip has already been rendered, exit
 
 			var text = options.content.text,
-				title = options.content.title.text,
+				title = options.content.title,
 				posOptions = options.position;
 
 			// Add ARIA attributes to target
@@ -682,7 +695,7 @@ function QTip(target, options, id, attr)
 			// Create tooltip element
 			tooltip = elements.tooltip = $('<div/>', {
 					'id': tooltipID,
-					'class': uitooltip + ' qtip ' + defaultClass + ' ' + options.style.classes + ' '+ uitooltip + '-pos-' + options.position.my.abbrev(),
+					'class': [ NAMESPACE, defaultClass, options.style.classes, NAMESPACE + '-pos-' + options.position.my.abbrev() ].join(' '),
 					'width': options.style.width || '',
 					'height': options.style.height || '',
 					'tracking': posOptions.target === 'mouse' && posOptions.adjust.mouse,
@@ -694,32 +707,35 @@ function QTip(target, options, id, attr)
 					'aria-describedby': tooltipID + '-content',
 					'aria-hidden': TRUE
 				})
-				.toggleClass(disabled, cache.disabled)
+				.toggleClass(disabledClass, cache.disabled)
 				.data('qtip', self)
 				.appendTo(options.position.container)
 				.append(
 					// Create content element
 					elements.content = $('<div />', {
-						'class': uitooltip + '-content',
+						'class': NAMESPACE + '-content',
 						'id': tooltipID + '-content',
 						'aria-atomic': TRUE
 					})
 				);
 
-			// Set rendered flag and prevent redundant redraw/reposition calls for now
+			// Set rendered flag and prevent redundant reposition calls for now
 			self.rendered = -1;
-			isDrawing = 1; isPositioning = 1;
+			isPositioning = 1;
 
 			// Create title...
-			if(title) {
+			if(title.text) {
 				createTitle();
 
 				// Update title only if its not a callback (called in toggle if so)
-				if(!$.isFunction(title)) { updateTitle(title, FALSE); }
+				if(!$.isFunction(title.text)) { updateTitle(title.text, FALSE); }
 			}
 
+			// Create button
+			else if(title.button) { createButton(); }
+
 			// Set proper rendered flag and update content if not a callback function (called in toggle)
-			if(!$.isFunction(text)) { updateContent(text, FALSE); }
+			if(!$.isFunction(text) || text.then) { updateContent(text, FALSE); }
 			self.rendered = TRUE;
 
 			// Setup widget classes
@@ -747,13 +763,10 @@ function QTip(target, options, id, attr)
 			*/
 			tooltip.queue('fx', function(next) {
 				// tooltiprender event
-				triggerEvent('render');
+				self._triggerEvent('render');
 
 				// Reset flags
-				isDrawing = 0; isPositioning = 0;
-
-				// Redraw the tooltip manually now we're fully rendered
-				self.redraw();
+				isPositioning = 0;
 
 				// Show tooltip if needed
 				if(options.show.ready || show) {
@@ -774,7 +787,8 @@ function QTip(target, options, id, attr)
 			{
 				case 'dimensions':
 					result = {
-						height: tooltip.outerHeight(), width: tooltip.outerWidth()
+						height: tooltip.outerHeight(FALSE),
+						width: tooltip.outerWidth(FALSE)
 					};
 				break;
 
@@ -797,7 +811,6 @@ function QTip(target, options, id, attr)
 			var rmove = /^position\.(my|at|adjust|target|container)|style|content|show\.ready/i,
 				rdraw = /^content\.(title|attr)|style/i,
 				reposition = FALSE,
-				redraw = FALSE,
 				checks = self.checks,
 				name;
 
@@ -831,9 +844,8 @@ function QTip(target, options, id, attr)
 				// Set the new params for the callback
 				option[notation] = [obj[0], obj[1], value, previous];
 
-				// Also check if we need to reposition / redraw
+				// Also check if we need to reposition
 				reposition = rmove.test(notation) || reposition;
-				redraw = rdraw.test(notation) || redraw;
 			});
 
 			// Re-sanitize options
@@ -841,17 +853,13 @@ function QTip(target, options, id, attr)
 
 			/*
 			* Execute any valid callbacks for the set options
-			* Also set isPositioning/isDrawing so we don't get loads of redundant repositioning
-			* and redraw calls.
+			* Also set isPositioning/isDrawing so we don't get loads of redundant repositioning calls.
 			*/
-			isPositioning = isDrawing = 1; $.each(option, callback); isPositioning = isDrawing = 0;
+			isPositioning = 1; $.each(option, callback); isPositioning = 0;
 
-			// Update position / redraw if needed
-			if(self.rendered && tooltip[0].offsetWidth > 0) {
-				if(reposition) {
-					self.reposition( options.position.target === 'mouse' ? NULL : cache.event );
-				}
-				if(redraw) { self.redraw(); }
+			// Update position if needed
+			if(self.rendered && tooltip[0].offsetWidth > 0 && reposition) {
+				self.reposition( options.position.target === 'mouse' ? NULL : cache.event );
 			}
 
 			return self;
@@ -859,6 +867,18 @@ function QTip(target, options, id, attr)
 
 		toggle: function(state, event)
 		{
+			// Try to prevent flickering when tooltip overlaps show element
+			if(event) {
+				if((/over|enter/).test(event.type) && (/out|leave/).test(cache.event.type) &&
+					options.show.target.add(event.target).length === options.show.target.length &&
+					tooltip.has(event.relatedTarget).length) {
+					return self;
+				}
+
+				// Cache event
+				cache.event = $.extend({}, event);
+			}
+	
 			// Render the tooltip if showing and it isn't already
 			if(!self.rendered) { return state ? self.render(1) : self; }
 
@@ -878,20 +898,8 @@ function QTip(target, options, id, attr)
 			// Return if element is already in correct state
 			if(!tooltip.is(':animated') && visible === state && sameTarget) { return self; }
 
-			// Try to prevent flickering when tooltip overlaps show element
-			if(event) {
-				if((/over|enter/).test(event.type) && (/out|leave/).test(cache.event.type) &&
-					options.show.target.add(event.target).length === options.show.target.length &&
-					tooltip.has(event.relatedTarget).length) {
-					return self;
-				}
-
-				// Cache event
-				cache.event = $.extend({}, event);
-			}
-
 			// tooltipshow/tooltiphide events
-			if(!triggerEvent(type, [90])) { return self; }
+			if(!self._triggerEvent(type, [90])) { return self; }
 
 			// Set ARIA hidden status attribute
 			$.attr(tooltip[0], 'aria-hidden', !!!state);
@@ -910,9 +918,7 @@ function QTip(target, options, id, attr)
 
 				// Cache mousemove events for positioning purposes (if not already tracking)
 				if(!trackingBound && posOptions.target === 'mouse' && posOptions.adjust.mouse) {
-					$(document).bind('mousemove.qtip', function(event) {
-						MOUSE = { pageX: event.pageX, pageY: event.pageY, type: 'mousemove' };
-					});
+					$(document).bind('mousemove.qtip', storeMouse);
 					trackingBound = TRUE;
 				}
 
@@ -921,7 +927,8 @@ function QTip(target, options, id, attr)
 
 				// Hide other tooltips if tooltip is solo
 				if(!!opts.solo) {
-					$(selector, opts.solo).not(tooltip).qtip('hide', $.Event('tooltipsolo'));
+					(typeof opts.solo === 'string' ? $(opts.solo) : $(selector, opts.solo))
+						.not(tooltip).not(opts.target).qtip('hide', $.Event('tooltipsolo'));
 				}
 			}
 			else {
@@ -970,7 +977,7 @@ function QTip(target, options, id, attr)
 				}
 
 				// tooltipvisible/tooltiphidden events
-				triggerEvent(state ? 'visible' : 'hidden');
+				self._triggerEvent(state ? 'visible' : 'hidden');
 			}
 
 			// If no effect type is supplied, use a simple toggle
@@ -1013,7 +1020,7 @@ function QTip(target, options, id, attr)
 			if(!tooltip.hasClass(focusClass))
 			{
 				// tooltipfocus event
-				if(triggerEvent('focus', [newIndex], cachedEvent)) {
+				if(self._triggerEvent('focus', [newIndex], cachedEvent)) {
 					// Only update z-index's if they've changed
 					if(curIndex !== newIndex) {
 						// Reduce our z-index's and keep them properly ordered
@@ -1040,7 +1047,7 @@ function QTip(target, options, id, attr)
 			tooltip.removeClass(focusClass);
 
 			// tooltipblur event
-			triggerEvent('blur', [tooltip.css('zIndex')], event);
+			self._triggerEvent('blur', [tooltip.css('zIndex')], event);
 
 			return self;
 		},
@@ -1058,16 +1065,18 @@ function QTip(target, options, id, attr)
 				at = posOptions.at,
 				adjust = posOptions.adjust,
 				method = adjust.method.split(' '),
-				elemWidth = tooltip.outerWidth(),
-				elemHeight = tooltip.outerHeight(),
+				elemWidth = tooltip.outerWidth(FALSE),
+				elemHeight = tooltip.outerHeight(FALSE),
 				targetWidth = 0,
 				targetHeight = 0,
-				fixed = tooltip.css('position') === 'fixed',
+				type = tooltip.css('position'),
 				viewport = posOptions.viewport,
 				position = { left: 0, top: 0 },
 				container = posOptions.container,
 				visible = tooltip[0].offsetWidth > 0,
-				adjusted, offset, win;
+				isScroll = event && event.type === 'scroll',
+				win = $(window),
+				adjusted, offset;
 
 			// Check if absolute position was passed
 			if($.isArray(target) && target.length === 2) {
@@ -1082,14 +1091,21 @@ function QTip(target, options, id, attr)
 				at = { x: LEFT, y: TOP };
 
 				// Use cached event if one isn't available for positioning
-				event = (event && (event.type === 'resize' || event.type === 'scroll') ? cache.event :
+				event = MOUSE && MOUSE.pageX && (adjust.mouse || !event || !event.pageX) ? { pageX: MOUSE.pageX, pageY: MOUSE.pageY } :
+					(event && (event.type === 'resize' || event.type === 'scroll') ? cache.event :
 					event && event.pageX && event.type === 'mousemove' ? event :
-					MOUSE && MOUSE.pageX && (adjust.mouse || !event || !event.pageX) ? { pageX: MOUSE.pageX, pageY: MOUSE.pageY } :
-					!adjust.mouse && cache.origin && cache.origin.pageX && options.show.distance ? cache.origin :
+					(!adjust.mouse || options.show.distance) && cache.origin && cache.origin.pageX ? cache.origin :
 					event) || event || cache.event || MOUSE || {};
 
 				// Use event coordinates for position
-				position = { top: event.pageY, left: event.pageX };
+				if(type !== 'static') { position = container.offset(); }
+				position = { left: event.pageX - position.left, top: event.pageY - position.top };
+
+				// Scroll events are a pain, some browsers
+				if(adjust.mouse && isScroll) {
+					position.left -= MOUSE.scrollX - win.scrollLeft();
+					position.top -= MOUSE.scrollY - win.scrollTop();
+				}
 			}
 
 			// Target wasn't mouse or absolute...
@@ -1124,13 +1140,13 @@ function QTip(target, options, id, attr)
 				else if(PLUGINS.imagemap && target.is('area')) {
 					adjusted = PLUGINS.imagemap(self, target, at, PLUGINS.viewport ? method : FALSE);
 				}
-				else if(PLUGINS.svg && typeof target[0].xmlbase === 'string') {
+				else if(PLUGINS.svg && target[0].ownerSVGElement) {
 					adjusted = PLUGINS.svg(self, target, at, PLUGINS.viewport ? method : FALSE);
 				}
 
 				else {
-					targetWidth = target.outerWidth();
-					targetHeight = target.outerHeight();
+					targetWidth = target.outerWidth(FALSE);
+					targetHeight = target.outerHeight(FALSE);
 
 					position = PLUGINS.offset(target, container);
 				}
@@ -1146,9 +1162,8 @@ function QTip(target, options, id, attr)
 				// Adjust for position.fixed tooltips (and also iOS scroll bug in v3.2-4.0 & v4.3-4.3.2)
 				if((PLUGINS.iOS > 3.1 && PLUGINS.iOS < 4.1) || 
 					(PLUGINS.iOS >= 4.3 && PLUGINS.iOS < 4.33) || 
-					(!PLUGINS.iOS && fixed)
+					(!PLUGINS.iOS && type === 'fixed')
 				){
-					win = $(window);
 					position.left -= win.scrollLeft();
 					position.top -= win.scrollTop();
 				}
@@ -1177,7 +1192,7 @@ function QTip(target, options, id, attr)
 			else { position.adjusted = { left: 0, top: 0 }; }
 
 			// tooltipmove event
-			if(!triggerEvent('move', [position, viewport.elem || viewport], event)) { return self; }
+			if(!self._triggerEvent('move', [position, viewport.elem || viewport], event)) { return self; }
 			delete position.adjusted;
 
 			// If effect is disabled, target it mouse, no animation is defined or positioning gives NaN out, set CSS directly
@@ -1197,73 +1212,20 @@ function QTip(target, options, id, attr)
 				});
 			}
 
-			// Set positioning flag
+			// Set positioning flagwtf
 			isPositioning = 0;
 
 			return self;
 		},
 
-		// Max/min width simulator function for all browsers.. yeaaah!
-		redraw: function()
-		{
-			if(self.rendered < 1 || isDrawing) { return self; }
-
-			var style = options.style,
-				container = options.position.container,
-				perc, width, max, min;
-
-			// Set drawing flag
-			isDrawing = 1;
-
-			// tooltipredraw event
-			triggerEvent('redraw');
-
-			// If tooltip has a set height/width, just set it... like a boss!
-			if(style.height) { tooltip.css(HEIGHT, style.height); }
-			if(style.width) { tooltip.css(WIDTH, style.width); }
-
-			// Simulate max/min width if not set width present...
-			else {
-				// Reset width and add fluid class
-				tooltip.css(WIDTH, '').appendTo(redrawContainer);
-
-				// Grab our tooltip width (add 1 if odd so we don't get wrapping problems.. huzzah!)
-				width = tooltip.width();
-				if(width % 2 < 1) { width += 1; }
-
-				// Grab our max/min properties
-				max = tooltip.css('max-width') || '';
-				min = tooltip.css('min-width') || '';
-
-				// Parse into proper pixel values
-				perc = (max + min).indexOf('%') > -1 ? container.width() / 100 : 0;
-				max = ((max.indexOf('%') > -1 ? perc : 1) * parseInt(max, 10)) || width;
-				min = ((min.indexOf('%') > -1 ? perc : 1) * parseInt(min, 10)) || 0;
-
-				// Determine new dimension size based on max/min/current values
-				width = max + min ? Math.min(Math.max(width, min), max) : width;
-
-				// Set the newly calculated width and remvoe fluid class
-				tooltip.css(WIDTH, Math.round(width)).appendTo(container);
-			}
-
-			// tooltipredrawn event
-			triggerEvent('redrawn');
-
-			// Set drawing flag
-			isDrawing = 0;
-
-			return self;
-		},
-
 		disable: function(state)
 		{
 			if('boolean' !== typeof state) {
-				state = !(tooltip.hasClass(disabled) || cache.disabled);
+				state = !(tooltip.hasClass(disabledClass) || cache.disabled);
 			}
 
 			if(self.rendered) {
-				tooltip.toggleClass(disabled, state);
+				tooltip.toggleClass(disabledClass, state);
 				$.attr(tooltip[0], 'aria-disabled', state);
 			}
 			else {
@@ -1509,7 +1471,7 @@ QTIP.bind = function(opts, event)
 		* Also set onTarget when triggered to keep mouse tracking working
 		*/
 		targets.show.bind('mousemove'+namespace, function(event) {
-			MOUSE = { pageX: event.pageX, pageY: event.pageY, type: 'mousemove' };
+			storeMouse(event);
 			api.cache.onTarget = TRUE;
 		});
 
@@ -1546,7 +1508,8 @@ QTIP.bind = function(opts, event)
 
 		// Prerendering is enabled, create tooltip now
 		if(options.show.ready || options.prerender) { hoverIntent(event); }
-	});
+	})
+	.attr('data-hasqtip', TRUE);
 };
 
 // Setup base plugins
@@ -1580,7 +1543,8 @@ PLUGINS = QTIP.plugins = {
 	// Custom (more correct for qTip!) offset calculator
 	offset: function(elem, container) {
 		var pos = elem.offset(),
-			docBody = elem.closest('body')[0],
+			docBody = elem.closest('body'),
+			quirks = $.browser.msie && document.compatMode !== 'CSS1Compat',
 			parent = container, scrolled,
 			coffset, overflow;
 
@@ -1605,8 +1569,10 @@ PLUGINS = QTIP.plugins = {
 			}
 			while((parent = $(parent[0].offsetParent)).length);
 
-			// Compensate for containers scroll if it also has an offsetParent
-			if(scrolled && scrolled[0] !== docBody) { scroll( scrolled, 1 ); }
+			// Compensate for containers scroll if it also has an offsetParent (or in IE quirks mode)
+			if(scrolled && scrolled[0] !== docBody[0] || quirks) {
+				scroll( scrolled || docBody, 1 );
+			}
 		}
 
 		return pos;
@@ -1709,6 +1675,7 @@ QTIP.defaults = {
 	content: {
 		text: TRUE,
 		attr: 'title',
+		deferred: FALSE,
 		title: {
 			text: FALSE,
 			button: FALSE
@@ -1724,7 +1691,7 @@ QTIP.defaults = {
 			x: 0, y: 0,
 			mouse: TRUE,
 			resize: TRUE,
-			method: 'flip flip'
+			method: 'flipinvert flipinvert'
 		},
 		effect: function(api, pos, viewport) {
 			$(this).animate(pos, {