Merge branch 'master' into widget-factory-demo

1 files changed, 70 insertions, 48 deletions

diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js
index 5c915ae30..61026882e 100644
--- a/tests/unit/tooltip/tooltip_events.js
+++ b/tests/unit/tooltip/tooltip_events.js
@@ -1,54 +1,76 @@
-/*
- * tooltip_events.js
- */
-(function($) {
-
-module("tooltip: events");
-
-test("programmatic triggers", function() {
-	expect(2);
-	var e = $("#tooltipped1").tooltip({
-		open: function(event, ui) {
-			same( event.type, "tooltipopen" );
-		},
-		close: function(event, ui) {
-			same( event.type, "tooltipclose" );
-		}
-	});
-	e.tooltip("open").tooltip("close");
-	e.tooltip("destroy");
+(function( $ ) {
+
+module( "tooltip: events" );
+
+test( "programmatic triggers", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event ) {
+		ok( !( "originalEvent" in event ), "open" );
+	});
+	element.tooltip( "open" );
+
+	element.one( "tooltipclose", function( event ) {
+		ok( !( "originalEvent" in event ), "close" );
+	});
+	element.tooltip( "close" );
+});
+
+test( "mouse events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event ) {
+		same( event.originalEvent.type, "mouseover" );
+	});
+	element.trigger( "mouseover" );
+
+	element.one( "tooltipclose", function( event ) {
+		same( event.originalEvent.type, "mouseleave" );
+	});
+	element.trigger( "mouseleave" );
 });
 
-test("mouse events", function() {
-	expect(4);
-	var e = $("#tooltipped1").tooltip({
-		open: function(event, ui) {
-			same( event.type, "tooltipopen" );
-			same( event.originalEvent.type, "mouseover" );
-		},
-		close: function(event, ui) {
-			same( event.type, "tooltipclose" );
-			same( event.originalEvent.type, "mouseleave" );
-		}
-	});
-	e.trigger("mouseover").trigger("mouseleave");
-	e.tooltip("destroy");
+test( "focus events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event ) {
+		same( event.originalEvent.type, "focusin" );
+	});
+	element.trigger( "focusin" );
+
+	element.one( "tooltipclose", function( event ) {
+		same( event.originalEvent.type, "blur" );
+	});
+	element.trigger( "blur" );
 });
 
-test("focus events", function() {
-	expect(4);
-	var e = $("#tooltipped1").tooltip({
-		open: function(event, ui) {
-			same( event.type, "tooltipopen" );
-			same( event.originalEvent.type, "focusin" );
-		},
-		close: function(event, ui) {
-			same( event.type, "tooltipclose" );
-			same( event.originalEvent.type, "blur" );
-		}
-	});
-	e.trigger("focus").trigger("blur");
-	e.tooltip("destroy");
+test( "mixed events", function() {
+	expect( 2 );
+	var element = $( "#tooltipped1" ).tooltip();
+
+	element.one( "tooltipopen", function( event ) {
+		same( event.originalEvent.type, "focusin" );
+	});
+	element[0].focus();
+
+	element.one( "tooltipopen", function() {
+		ok( false, "open triggered while already open" );
+	});
+	element.trigger( "mouseover" );
+
+	element.bind( "tooltipclose", function( event ) {
+		ok( false, "close triggered while still focused" );
+	});
+	element.trigger( "mouseleave" );
+	element.unbind( "tooltipclose" );
+
+	element.one( "tooltipclose", function( event ) {
+		same( event.originalEvent.type, "blur" );
+	});
+	element[0].blur();
 });
 
-})(jQuery);
+}( jQuery ) );