Skip to content
Permalink
Browse files

Popup: Rename _close to close and use it when selecting something wit…

…hin a popup.
  • Loading branch information...
jzaefferer committed May 4, 2011
1 parent bba4cb2 commit b96126b398777b5ed2ecf795c234f99c544ee61c
Showing with 12 additions and 8 deletions.
  1. +6 −2 demos/tooltip/video-player.html
  2. +1 −1 tests/visual/menu/popup.html
  3. +5 −5 tests/visual/menu/popup.js
@@ -24,8 +24,12 @@
});
$(".set").buttonset();
// TODO hide the tooltip when clicking the button
$("ul").menu().popup({
$("ul").menu({
select: function() {
// would also execute some other action here
$(this).popup("close");
}
}).popup({
trigger: $(".menu")
});
@@ -25,7 +25,7 @@
var selected = {
select: function( event, ui ) {
$( "<div/>" ).text( "Selected: " + ui.item.text() ).appendTo( "#log" );
$(this).hide();
$(this).popup("close");
}
};
@@ -34,7 +34,7 @@ $.widget( "ui.popup", {

this.element
.addClass("ui-popup")
this._close();
this.close();

this._bind(this.options.trigger, {
click: function( event ) {
@@ -53,15 +53,15 @@ $.widget( "ui.popup", {
this._bind(this.element, {
// TODO also triggered when open and clicking the trigger again
// figure out how to close in that case, while still closing on regular blur
//blur: "_close"
//blur: "close"
});

this._bind({
// TODO only triggerd on element if it can receive focus
// bind to document instead?
keyup: function( event ) {
if (event.keyCode == $.ui.keyCode.ESCAPE && this.element.is( ":visible" )) {
this._close( event );
this.close( event );
this.options.trigger.focus();
}
}
@@ -70,7 +70,7 @@ $.widget( "ui.popup", {
this._bind(document, {
click: function( event ) {
if (this.open && !$(event.target).closest(".ui-popup").length) {
this._close( event );
this.close( event );
}
}
})
@@ -114,7 +114,7 @@ $.widget( "ui.popup", {
this._trigger( "open", event );
},

_close: function( event ) {
close: function( event ) {
this.element
.hide()
.attr( "aria-hidden", true )

0 comments on commit b96126b

Please sign in to comment.
You can’t perform that action at this time.