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

Commit b83fa14

Browse files
author
Gabriel Schulhof
committed
Renamed class ui-selectmenu-hidden to ui-popup-hidden -- Fixes #5217
1 parent d859a59 commit b83fa14

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

css/structure/jquery.mobile.forms.select.css

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ label.ui-select { font-size: 16px; line-height: 1.4; font-weight: normal; margin
3434
.ui-selectmenu { padding: 6px; min-width: 160px; }
3535
.ui-selectmenu .ui-listview { margin: 0; }
3636
.ui-selectmenu .ui-btn.ui-li-divider { cursor: default; }
37-
.ui-selectmenu-hidden { top: -99999px; left: -9999px; }
3837
.ui-screen-hidden, .ui-selectmenu-list .ui-li .ui-icon { display: none; }
3938
.ui-selectmenu-list .ui-li .ui-icon { display: block; }
4039
.ui-li.ui-selectmenu-placeholder { display: none; }

css/structure/jquery.mobile.popup.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,4 +169,6 @@
169169
.ui-popup.ui-corner-all > .ui-footer:only-child {
170170
-webkit-border-radius: inherit;
171171
border-radius: inherit;
172-
}
172+
}
173+
174+
.ui-popup-hidden { top: -99999px; left: -9999px; }

js/widgets/popup.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,11 @@ define( [ "jquery",
111111
_resizeTimeout: function() {
112112
if ( this._isOpen ) {
113113
if ( !this._expectResizeEvent() ) {
114-
if ( this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
114+
if ( this._ui.container.hasClass( "ui-popup-hidden" ) ) {
115115
// effectively rapid-open the popup while leaving the screen intact
116116
this._trigger( "beforeposition" );
117117
this._ui.container
118-
.removeClass( "ui-selectmenu-hidden" )
118+
.removeClass( "ui-popup-hidden" )
119119
.offset( this._placementCoords( this._desiredCoords( undefined, undefined, "window" ) ) );
120120
}
121121

@@ -132,10 +132,10 @@ define( [ "jquery",
132132
_handleWindowResize: function( e ) {
133133
if ( this._isOpen ) {
134134
if ( ( this._expectResizeEvent() || this._orientationchangeInProgress ) &&
135-
!this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
135+
!this._ui.container.hasClass( "ui-popup-hidden" ) ) {
136136
// effectively rapid-close the popup while leaving the screen intact
137137
this._ui.container
138-
.addClass( "ui-selectmenu-hidden" )
138+
.addClass( "ui-popup-hidden" )
139139
.removeAttr( "style" );
140140
}
141141
}
@@ -152,7 +152,7 @@ define( [ "jquery",
152152
var ui = {
153153
screen: $( "<div class='ui-screen-hidden ui-popup-screen'></div>" ),
154154
placeholder: $( "<div style='display: none;'><!-- placeholder --></div>" ),
155-
container: $( "<div class='ui-popup-container ui-selectmenu-hidden'></div>" )
155+
container: $( "<div class='ui-popup-container ui-popup-hidden'></div>" )
156156
},
157157
thisPage = this.element.closest( ".ui-page" ),
158158
myId = this.element.attr( "id" ),
@@ -582,7 +582,7 @@ define( [ "jquery",
582582
this._ui.screen.removeClass( "ui-screen-hidden" );
583583

584584
this._ui.container
585-
.removeClass( "ui-selectmenu-hidden" )
585+
.removeClass( "ui-popup-hidden" )
586586
.offset( coords );
587587

588588
if ( this.options.overlayTheme && androidBlacklist ) {
@@ -622,7 +622,7 @@ define( [ "jquery",
622622
_closePrereqContainer: function() {
623623
this._ui.container
624624
.removeClass( "reverse out" )
625-
.addClass( "ui-selectmenu-hidden" )
625+
.addClass( "ui-popup-hidden" )
626626
.removeAttr( "style" );
627627
},
628628

tests/unit/select/select_core.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
},
6262

6363
function(){
64-
deepEqual($("#select-choice-few-menu").parent().parent(".ui-selectmenu-hidden").length, 1);
64+
deepEqual($("#select-choice-few-menu").parent().parent(".ui-popup-hidden").length, 1);
6565
start();
6666
}
6767
], 1000);
@@ -297,7 +297,7 @@
297297
},
298298

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

@@ -312,7 +312,7 @@
312312
},
313313

314314
function() {
315-
deepEqual( $( ".ui-popup-container:not(.ui-selectmenu-hidden) .ui-selectmenu ul" ).text(), text );
315+
deepEqual( $( ".ui-popup-container:not(.ui-popup-hidden) .ui-selectmenu ul" ).text(), text );
316316
$( ".ui-popup-screen" ).click();
317317
},
318318

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

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

0 commit comments

Comments
 (0)