library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2024-11-21 11:04:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix various pull request comments and coding standards issues

Browse Source
This commit is contained in:
Hans Hillen 2011-05-30 23:37:14 +02:00
parent ab2bbd3bab
commit 6d01873dd8
2 changed files with 76 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/popup/default.html
View File

@ -56,7 +56,6 @@
<div class="demo">
<a href="#login-form">Log In</a>
<div class="ui-widget-content" id="login-form" aria-label="Login options">
<form>
<div>
<label for="un">Username</label>
<input type="text" id="un" />
@ -68,12 +67,7 @@
<div>
<input type="submit" value="Login" class="submit" />
</div>
</form>
</div>
</div>
<div class="demo-description">

66
ui/jquery.ui.popup.js vendored
View File

@ -49,9 +49,9 @@ $.widget( "ui.popup", {
this._bind(this.options.trigger, {
keydown: function( event ) {
// prevent space-to-open to scroll the page, only hapens for anchor ui.button
// prevent space-to-open to scroll the page, only happens for anchor ui.button
if ( this.options.trigger.is( "a:ui-button" ) && event.keyCode == $.ui.keyCode.SPACE ) {
event.preventDefault()
event.preventDefault();
}
// TODO handle SPACE to open popup? only when not handled by ui.button
if ( event.keyCode == $.ui.keyCode.SPACE && this.options.trigger.is( "a:not(:ui-button)" ) ) {
@ -79,7 +79,28 @@ $.widget( "ui.popup", {
}
});
this._bind(this.element, {
if ( !this.element.is( ":ui-menu" ) ) {
//default use case, wrap tab order in popup
this.element.bind( "keydown.ui-popup", function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) {
return;
}
var tabbables = $( ":tabbable", this ),
first = tabbables.first(),
last = tabbables.last();
if ( event.target === last[ 0 ] && !event.shiftKey ) {
first.focus( 1 );
return false;
} else if ( event.target === first[ 0 ] && event.shiftKey ) {
last.focus( 1 );
return false;
}
});
}
this._bind({
focusout: function( event ) {
var that = this;
// use a timer to allow click to clear it and letting that
@ -89,8 +110,7 @@ $.widget( "ui.popup", {
}, 100);
},
focusin: function( event ) {
var that = this;
clearTimeout( that.closeTimer );
clearTimeout( this.closeTimer );
}
});
@ -121,7 +141,8 @@ $.widget( "ui.popup", {
.show()
.removeClass( "ui-popup" )
.removeAttr( "aria-hidden" )
.removeAttr( "aria-expanded" );
.removeAttr( "aria-expanded" )
.unbind( "keypress.ui-popup");
this.options.trigger
.removeAttr( "aria-haspopup" )
@ -147,43 +168,23 @@ $.widget( "ui.popup", {
.position( position );
if (this.element.is( ":ui-menu" )) { //popup is a menu
this.element.focus();
this.element.menu( "focus", event, this.element.children( "li" ).first() );
this.element.focus();
}
// TODO add other special use cases that differ from the default dialog style keyboard mechanism
else {
//default use case, popup could be anything (e.g. a form)
this.element
.bind( "keydown.ui-popup", function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) {
return;
}
var tabbables = $( ":tabbable", this ),
first = tabbables.filter( ":first" ),
last = tabbables.filter( ":last" );
if ( event.target === last[0] && !event.shiftKey ) {
first.focus( 1 );
return false;
} else if ( event.target === first[0] && event.shiftKey ) {
last.focus( 1 );
return false;
}
});
} else {
// set focus to the first tabbable element in the popup container
// if there are no tabbable elements, set focus on the popup itself
var tabbables = this.element.find( ":tabbable" );
if ( !tabbables.length ) {
if ( !this.element.is(":tabbable") ) {
this.element.attr("tabindex", "0");
}
tabbables.add(this.element);
}
tabbables.eq( 0 ).focus(1);
tabbables.first().focus( 1 );
}
// take trigger out of tab order to allow shift-tab to skip trigger
this.options.trigger.attr( "tabindex", -1 );
this.isOpen = true;
this._trigger( "open", event );
},
@ -192,16 +193,13 @@ $.widget( "ui.popup", {
this.element
.hide()
.attr( "aria-hidden", true )
.attr( "aria-expanded", false )
.unbind( "keypress.ui-popup");
.attr( "aria-expanded", false );
this.options.trigger.attr("tabindex", 0);
this.isOpen = false;
this._trigger( "close", event );
}
});
}(jQuery));