Skip to content
This repository has been archived by the owner on Oct 8, 2021. It is now read-only.

Commit

Permalink
Renamed class ui-selectmenu-hidden to ui-popup-hidden -- Fixes #5217
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Schulhof committed Oct 25, 2012
1 parent affcc54 commit 4527be3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 13 deletions.
1 change: 0 additions & 1 deletion css/structure/jquery.mobile.forms.select.css
Expand Up @@ -34,7 +34,6 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin
.ui-selectmenu { padding: 6px; min-width: 160px; }
.ui-selectmenu .ui-listview { margin: 0; }
.ui-selectmenu .ui-btn.ui-li-divider { cursor: default; }
.ui-selectmenu-hidden { top: -99999px; left: -9999px; }
.ui-screen-hidden, .ui-selectmenu-list .ui-li .ui-icon { display: none; }
.ui-selectmenu-list .ui-li .ui-icon { display: block; }
.ui-li.ui-selectmenu-placeholder { display: none; }
Expand Down
4 changes: 3 additions & 1 deletion css/structure/jquery.mobile.popup.css
Expand Up @@ -169,4 +169,6 @@
.ui-popup.ui-corner-all > .ui-footer:only-child {
-webkit-border-radius: inherit;
border-radius: inherit;
}
}

.ui-popup-hidden { top: -99999px; left: -9999px; }
14 changes: 7 additions & 7 deletions js/widgets/popup.js
Expand Up @@ -114,11 +114,11 @@ define( [ "jquery",
_resizeTimeout: function() {
if ( this._isOpen ) {
if ( !this._expectResizeEvent() ) {
if ( this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
if ( this._ui.container.hasClass( "ui-popup-hidden" ) ) {
// effectively rapid-open the popup while leaving the screen intact
this._trigger( "beforeposition" );
this._ui.container
.removeClass( "ui-selectmenu-hidden" )
.removeClass( "ui-popup-hidden" )
.offset( this._placementCoords( this._desiredCoords( undefined, undefined, "window" ) ) );
}

Expand All @@ -135,10 +135,10 @@ define( [ "jquery",
_handleWindowResize: function( e ) {
if ( this._isOpen ) {
if ( ( this._expectResizeEvent() || this._orientationchangeInProgress ) &&
!this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
!this._ui.container.hasClass( "ui-popup-hidden" ) ) {
// effectively rapid-close the popup while leaving the screen intact
this._ui.container
.addClass( "ui-selectmenu-hidden" )
.addClass( "ui-popup-hidden" )
.removeAttr( "style" );
}
}
Expand Down Expand Up @@ -167,7 +167,7 @@ define( [ "jquery",
var ui = {
screen: $( "<div class='ui-screen-hidden ui-popup-screen'></div>" ),
placeholder: $( "<div style='display: none;'><!-- placeholder --></div>" ),
container: $( "<div class='ui-popup-container ui-selectmenu-hidden'></div>" )
container: $( "<div class='ui-popup-container ui-popup-hidden'></div>" )
},
thisPage = this.element.closest( ".ui-page" ),
myId = this.element.attr( "id" ),
Expand Down Expand Up @@ -592,7 +592,7 @@ define( [ "jquery",
this._ui.screen.removeClass( "ui-screen-hidden" );

this._ui.container
.removeClass( "ui-selectmenu-hidden" )
.removeClass( "ui-popup-hidden" )
.offset( coords );

if ( this.options.overlayTheme && androidBlacklist ) {
Expand Down Expand Up @@ -632,7 +632,7 @@ define( [ "jquery",
_closePrereqContainer: function() {
this._ui.container
.removeClass( "reverse out" )
.addClass( "ui-selectmenu-hidden" )
.addClass( "ui-popup-hidden" )
.removeAttr( "style" );
},

Expand Down
8 changes: 4 additions & 4 deletions tests/unit/select/select_core.js
Expand Up @@ -61,7 +61,7 @@
},

function(){
deepEqual($("#select-choice-few-menu").parent().parent(".ui-selectmenu-hidden").length, 1);
deepEqual($("#select-choice-few-menu").parent().parent(".ui-popup-hidden").length, 1);
start();
}
], 1000);
Expand Down Expand Up @@ -297,7 +297,7 @@
},

function() {
deepEqual( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), "default" );
deepEqual( $( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(), "default" );
$( ".ui-popup-screen" ).click();
},

Expand All @@ -312,7 +312,7 @@
},

function() {
deepEqual( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), text );
deepEqual( $( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(), text );
$( ".ui-popup-screen" ).click();
},

Expand Down Expand Up @@ -389,7 +389,7 @@
test( "a disabled custom select should still be enhanced as custom", function() {
$("#select-disabled-enhancetest").selectmenu("enable").selectmenu("open");

var menu = $(".ui-selectmenu").not( ".ui-selectmenu-hidden" );
var menu = $(".ui-selectmenu").not( ".ui-popup-hidden" );
ok( menu.text().indexOf("disabled enhance test") > -1, "the right select is showing" );
});

Expand Down

0 comments on commit 4527be3

Please sign in to comment.