Skip to content
Permalink
Browse files

Popup: Make menu dependency actually optional, cleanup demos

  • Loading branch information
jzaefferer committed Sep 21, 2011
1 parent a3866bf commit cb372b7c2022f0827a5aeab117f0a21ff7cb8193
Showing with 4 additions and 27 deletions.
  1. +0 −12 demos/popup/animation.html
  2. +0 −12 demos/popup/default.html
  3. +4 −3 ui/jquery.ui.popup.js
@@ -9,7 +9,6 @@
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.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.blind.js"></script>
<script src="../../ui/jquery.effects.scale.js"></script>
@@ -43,17 +42,6 @@
</script>
<style type="text/css">
.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 {
width: 16em; border: 1px solid gray; border-radius: 5px;
@@ -9,7 +9,6 @@
<script src="../../ui/jquery.ui.widget.js"></script>
<script src="../../ui/jquery.ui.position.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>
$(function() {
@@ -28,17 +27,6 @@
</script>
<style type="text/css">
.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 {
width: 16em; border: 1px solid gray; border-radius: 5px;
@@ -88,8 +88,8 @@ $.widget( "ui.popup", {
}
});

if ( !this.element.is( ":ui-menu" ) ) {
//default use case, wrap tab order in popup
if ( !$.ui.menu || !this.element.is( ":ui-menu" ) ) {
// default use case, wrap tab order in popup
this._bind({ keydown : function( event ) {
if ( event.keyCode !== $.ui.keyCode.TAB ) {
return;
@@ -174,7 +174,8 @@ $.widget( "ui.popup", {
.attr( "aria-expanded", "true" )
.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.focus();
} else {

0 comments on commit cb372b7

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