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

Commit

Permalink
[popup] Rename function _maybeRefreshTimeout to _expectResizeEvent
Browse files Browse the repository at this point in the history
Conflicts:

	js/widgets/popup.js
  • Loading branch information
Gabriel Schulhof committed Oct 25, 2012
1 parent d73f896 commit d859a59
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions js/widgets/popup.js
Expand Up @@ -84,7 +84,7 @@ define( [ "jquery",
}
},

_maybeRefreshTimeout: function() {
_expectResizeEvent: function() {
var winCoords = windowCoords();

if ( this._resizeData ) {
Expand All @@ -110,7 +110,7 @@ define( [ "jquery",

_resizeTimeout: function() {
if ( this._isOpen ) {
if ( !this._maybeRefreshTimeout() ) {
if ( !this._expectResizeEvent() ) {
if ( this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
// effectively rapid-open the popup while leaving the screen intact
this._trigger( "beforeposition" );
Expand All @@ -131,7 +131,7 @@ define( [ "jquery",

_handleWindowResize: function( e ) {
if ( this._isOpen ) {
if ( ( this._maybeRefreshTimeout() || this._orientationchangeInProgress ) &&
if ( ( this._expectResizeEvent() || this._orientationchangeInProgress ) &&
!this._ui.container.hasClass( "ui-selectmenu-hidden" ) ) {
// effectively rapid-close the popup while leaving the screen intact
this._ui.container
Expand All @@ -143,7 +143,7 @@ define( [ "jquery",

_handleWindowOrientationchange: function( e ) {
if ( !this._orientationchangeInProgress && this._isOpen ) {
this._maybeRefreshTimeout();
this._expectResizeEvent();
this._orientationchangeInProgress = true;
}
},
Expand Down Expand Up @@ -525,7 +525,7 @@ define( [ "jquery",
// the "blue flash" of element focus in android 4.0
setTimeout(function(){
self._ui.container.attr( "tabindex", "0" ).focus();
self._maybeRefreshTimeout();
self._expectResizeEvent();
self._trigger( "afteropen" );
});
},
Expand Down

0 comments on commit d859a59

Please sign in to comment.