aboutsummaryrefslogtreecommitdiffstats
path: root/ui/jquery.ui.dialog.js
diff options
context:
space:
mode:
authorFelix Nagel <info@felixnagel.com>2012-07-12 23:57:55 +0200
committerFelix Nagel <info@felixnagel.com>2012-07-12 23:57:55 +0200
commit5092d0296a010280ee9d004f2fe06afbf1c45db5 (patch)
treeac6b97b4551b4aebf8d90cc35add82fc7088e0a3 /ui/jquery.ui.dialog.js
parent39532f0a8e70e21e33aab03f08136f662d03a4a1 (diff)
parente054e28836e616ed03561d5a8195bbea525866d1 (diff)
downloadjquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.tar.gz
jquery-ui-5092d0296a010280ee9d004f2fe06afbf1c45db5.zip
Merge branch 'master' into selectmenu
Diffstat (limited to 'ui/jquery.ui.dialog.js')
-rw-r--r--ui/jquery.ui.dialog.js11
1 files changed, 6 insertions, 5 deletions
diff --git a/ui/jquery.ui.dialog.js b/ui/jquery.ui.dialog.js
index 4ef8a20cb..85e4b3e2b 100644
--- a/ui/jquery.ui.dialog.js
+++ b/ui/jquery.ui.dialog.js
@@ -1,7 +1,8 @@
/*!
* jQuery UI Dialog @VERSION
+ * http://jqueryui.com
*
- * Copyright 2012, AUTHORS.txt (http://jqueryui.com/about)
+ * Copyright 2012 jQuery Foundation and other contributors
* Dual licensed under the MIT or GPL Version 2 licenses.
* http://jquery.org/license
*
@@ -224,7 +225,7 @@ $.widget("ui.dialog", {
if ( this.overlay ) {
this.overlay.destroy();
}
- this.uiDialog.unbind( "keypress.ui-dialog" );
+ this._off( this.uiDialog, "keypress" );
if ( this.options.hide ) {
this.uiDialog.hide( this.options.hide, function() {
@@ -310,12 +311,12 @@ $.widget("ui.dialog", {
// prevent tabbing out of modal dialogs
if ( options.modal ) {
- uiDialog.bind( "keydown.ui-dialog", function( event ) {
+ this._on( uiDialog, { keydown: function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) {
return;
}
- var tabbables = $( ":tabbable", this ),
+ var tabbables = $( ":tabbable", uiDialog ),
first = tabbables.filter( ":first" ),
last = tabbables.filter( ":last" );
@@ -326,7 +327,7 @@ $.widget("ui.dialog", {
last.focus( 1 );
return false;
}
- });
+ }});
}
// set focus to the first tabbable element in the content area or the first button