From d859a5941b46323d0625c2bc697e5670af3569ad Mon Sep 17 00:00:00 2001
From: Gabriel Schulhof <gabriel.schulhof@intel.com>
Date: Fri, 26 Oct 2012 01:13:31 +0300
Subject: [PATCH] [popup] Rename function _maybeRefreshTimeout to
 _expectResizeEvent

Conflicts:

	js/widgets/popup.js
---
 js/widgets/popup.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index 14a064c5113..7ec7ff0b6b4 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -84,7 +84,7 @@ define( [ "jquery",
 			}
 		},
 
-		_maybeRefreshTimeout: function() {
+		_expectResizeEvent: function() {
 			var winCoords = windowCoords();
 
 			if ( this._resizeData ) {
@@ -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" );
@@ -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
@@ -143,7 +143,7 @@ define( [ "jquery",
 
 		_handleWindowOrientationchange: function( e ) {
 			if ( !this._orientationchangeInProgress && this._isOpen ) {
-				this._maybeRefreshTimeout();
+				this._expectResizeEvent();
 				this._orientationchangeInProgress = true;
 			}
 		},
@@ -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" );
 			});
 		},