From 48a5977d3325869abd7b7ba835eb8ac331fd6eb5 Mon Sep 17 00:00:00 2001 From: jzaefferer Date: Tue, 26 Oct 2010 17:07:22 +0200 Subject: Tooltip: Implementing event delegation support. --- tests/unit/tooltip/tooltip_defaults.js | 1 + tests/unit/tooltip/tooltip_events.js | 4 +-- tests/unit/tooltip/tooltip_options.js | 5 ++++ tests/visual/tooltip/tooltip.html | 45 +++++++++++++++++++--------------- 4 files changed, 33 insertions(+), 22 deletions(-) (limited to 'tests') diff --git a/tests/unit/tooltip/tooltip_defaults.js b/tests/unit/tooltip/tooltip_defaults.js index c9960d334..419d7a085 100644 --- a/tests/unit/tooltip/tooltip_defaults.js +++ b/tests/unit/tooltip/tooltip_defaults.js @@ -4,6 +4,7 @@ var tooltip_defaults = { disabled: false, + items: "[title]", content: $.ui.tooltip.prototype.options.content, position: { my: "left center", diff --git a/tests/unit/tooltip/tooltip_events.js b/tests/unit/tooltip/tooltip_events.js index 51c56b62e..35620df47 100644 --- a/tests/unit/tooltip/tooltip_events.js +++ b/tests/unit/tooltip/tooltip_events.js @@ -24,11 +24,11 @@ test("mouse events", function() { var e = $("#tooltipped1").tooltip({ open: function(event, ui) { same( event.type, "tooltipopen" ); - same( event.originalEvent.type, "mouseenter" ); + same( event.originalEvent.type, "mouseover" ); }, close: function(event, ui) { same( event.type, "tooltipclose" ); - same( event.originalEvent.type, "mouseleave" ); + same( event.originalEvent.type, "mouseout" ); } }); e.trigger("mouseover").trigger("mouseout"); diff --git a/tests/unit/tooltip/tooltip_options.js b/tests/unit/tooltip/tooltip_options.js index 99d582489..6962d1e86 100644 --- a/tests/unit/tooltip/tooltip_options.js +++ b/tests/unit/tooltip/tooltip_options.js @@ -9,6 +9,11 @@ module("tooltip: options", { } }); + +test("option: items", function() { + ok(false, "missing items test"); +}); + test("content: default", function() { $("#tooltipped1").tooltip().tooltip("open"); same( $(".ui-tooltip").text(), "anchortitle" ); diff --git a/tests/visual/tooltip/tooltip.html b/tests/visual/tooltip/tooltip.html index 1e2832e34..6d4e15c9e 100644 --- a/tests/visual/tooltip/tooltip.html +++ b/tests/visual/tooltip/tooltip.html @@ -21,16 +21,17 @@ function enable() { // default - $("#context1 a, form input, #childish").tooltip(); + $("#context1, form, #childish").tooltip(); // custom class, replaces ui-widget-content - $("#context2 [title]").tooltip().each(function() { + $("#context2").tooltip().each(function() { $(this).tooltip("widget").addClass("ui-widget-header"); }) $("#right1").tooltip().tooltip("widget").addClass("ui-state-error"); // synchronous content - $("#see-footnote").tooltip({ + $("#footnotes").tooltip({ + items: "[href^=#]", content: function() { return $($(this).attr("href")).html(); } @@ -70,25 +71,25 @@ } }).tooltip("widget").addClass("ui-state-highlight"); - var positionOnTop = { - position: { - my: "center bottom", - at: "center top", - offset: "0 -5" - } - }; - $("#button1").button().tooltip(positionOnTop); + $("#button1").button(); $("#button2").button({ icons: { primary: "ui-icon-wrench" } - }).tooltip(positionOnTop); + }); $("#button3, #button4").button({ icons: { primary: "ui-icon-wrench" }, text: false - }).tooltip(positionOnTop); + }); + $("#buttons").tooltip({ + position: { + my: "center bottom", + at: "center top", + offset: "0 -5" + } + }); } enable(); @@ -121,8 +122,9 @@ collision detection should kick in around here -
- I'm a link to a footnote. +
@@ -159,12 +161,15 @@
- - - - +
+ + + + +
-
This is the footnote, including other elements
+
This is the footnote, including other elements
+
This is the other footnote, including other elements
-- cgit v1.2.3