library-mirrors/jquery-ui
1
0
Fork 0
mirror of https://github.com/jquery/jquery-ui.git synced 2025-01-07 20:34:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Popup: Make menu dependency actually optional, cleanup demos

Browse Source
This commit is contained in:
Jörn Zaefferer 2011-09-21 22:54:29 +02:00
parent a3866bf057
commit cb372b7c20
3 changed files with 4 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
demos/popup/animation.html
View File

@ -9,7 +9,6 @@
<script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script> <script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script> <script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.effects.core.js"></script> <script src="../../ui/jquery.effects.core.js"></script>
<script src="../../ui/jquery.effects.blind.js"></script> <script src="../../ui/jquery.effects.blind.js"></script>
<script src="../../ui/jquery.effects.scale.js"></script> <script src="../../ui/jquery.effects.scale.js"></script>
@ -43,17 +42,6 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.ui-popup { position: absolute; z-index: 5000; } .ui-popup { position: absolute; z-index: 5000; }
.ui-menu { width: 200px; }
/*
table {
border-collapse: collapse;
}
th, td {
padding: 0.5em;
border: 1px solid black;
}
*/
#login-form { #login-form {
width: 16em; border: 1px solid gray; border-radius: 5px; width: 16em; border: 1px solid gray; border-radius: 5px;

12
demos/popup/default.html
View File

@ -9,7 +9,6 @@
<script src="../../ui/jquery.ui.widget.js"></script> <script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.js"></script> <script src="../../ui/jquery.ui.position.js"></script>
<script src="../../ui/jquery.ui.button.js"></script> <script src="../../ui/jquery.ui.button.js"></script>
<script src="../../ui/jquery.ui.menu.js"></script>
<script src="../../ui/jquery.ui.popup.js"></script> <script src="../../ui/jquery.ui.popup.js"></script>
<script> <script>
$(function() { $(function() {
@ -28,17 +27,6 @@
</script> </script>
<style type="text/css"> <style type="text/css">
.ui-popup { position: absolute; z-index: 5000; } .ui-popup { position: absolute; z-index: 5000; }
.ui-menu { width: 200px; }
/*
table {
border-collapse: collapse;
}
th, td {
padding: 0.5em;
border: 1px solid black;
}
*/
#login-form { #login-form {
width: 16em; border: 1px solid gray; border-radius: 5px; width: 16em; border: 1px solid gray; border-radius: 5px;

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

@ -88,8 +88,8 @@ $.widget( "ui.popup", {
} }
}); });
if ( !this.element.is( ":ui-menu" ) ) { if ( !$.ui.menu || !this.element.is( ":ui-menu" ) ) {
//default use case, wrap tab order in popup // default use case, wrap tab order in popup
this._bind({ keydown : function( event ) { this._bind({ keydown : function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) { if ( event.keyCode !== $.ui.keyCode.TAB ) {
return; return;
@ -174,7 +174,8 @@ $.widget( "ui.popup", {
.attr( "aria-expanded", "true" ) .attr( "aria-expanded", "true" )
.position( position ); .position( position );
if (this.element.is( ":ui-menu" )) { //popup is a menu // can't use custom selector when menu isn't loaded
if ( $.ui.menu && this.element.is( ":ui-menu" ) ) {
this.element.menu( "focus", event, this.element.children( "li" ).first() ); this.element.menu( "focus", event, this.element.children( "li" ).first() );
this.element.focus(); this.element.focus();
} else { } else {