From 98173a3d0ea8e2e6aeb19dda9b232cb65a0684e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Zaefferer?= <joern.zaefferer@gmail.com>
Date: Mon, 5 Nov 2012 18:59:52 +0100
Subject: [PATCH] Tooltip: Check type on event directly, preventing TypeError
 when programmatically moving focus to track-toolipped-input. Fixes #8747 -
 Tooltip: Using the track option within dialogs creates JS errors

---
 tests/unit/tooltip/tooltip_options.js | 8 ++++++++
 ui/jquery.ui.tooltip.js               | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js
index 9f0de2b5707..f9da27fb743 100644
--- a/tests/unit/tooltip/tooltip_options.js
+++ b/tests/unit/tooltip/tooltip_options.js
@@ -146,4 +146,12 @@ test( "track + show delay", function() {
 	equal( $( ".ui-tooltip" ).css( "top" ), topVal + offsetVal + "px" );
 });
 
+test( "track and programmatic focus", function() {
+	expect( 1 );
+	$( "#qunit-fixture div input" ).tooltip({
+		track: true
+	}).focus();
+	equal( "inputtitle", $( ".ui-tooltip" ).text() );
+});
+
 }( jQuery ) );
diff --git a/ui/jquery.ui.tooltip.js b/ui/jquery.ui.tooltip.js
index c05be1d4575..325e20efbae 100644
--- a/ui/jquery.ui.tooltip.js
+++ b/ui/jquery.ui.tooltip.js
@@ -252,7 +252,7 @@ $.widget( "ui.tooltip", {
 			}
 			tooltip.position( positionOption );
 		}
-		if ( this.options.track && event && /^mouse/.test( event.originalEvent.type ) ) {
+		if ( this.options.track && event && /^mouse/.test( event.type ) ) {
 			this._on( this.document, {
 				mousemove: position
 			});