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

Commit

Permalink
[navigation] Rename navReadyDeferred to navreadyDeferred
Browse files Browse the repository at this point in the history
  • Loading branch information
Gabriel Schulhof committed Jun 8, 2012
1 parent 8c56173 commit 9033a97
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion js/jquery.mobile.init.js
Expand Up @@ -95,7 +95,7 @@ define( [ "jquery", "./jquery.mobile.core", "./jquery.mobile.support", "./jquery
});

// initialize events now, after mobileinit has occurred
$.mobile.navReadyDeferred.resolve();
$.mobile.navreadyDeferred.resolve();

// check which scrollTop value should be used by scrolling to 1 immediately at domready
// then check what the scroll top is. Android will report 0... others 1
Expand Down
6 changes: 3 additions & 3 deletions js/jquery.mobile.navigation.js
Expand Up @@ -1192,8 +1192,8 @@ define( [

//The following event bindings should be bound after mobileinit has been triggered
//the following deferred is resolved in the init file
$.mobile.navReadyDeferred = $.Deferred();
$.mobile.navReadyDeferred.done( function(){
$.mobile.navreadyDeferred = $.Deferred();
$.mobile.navreadyDeferred.done( function(){
//bind to form submit events, handle with Ajax
$( document ).delegate( "form", "submit", function( event ) {
var $this = $( this );
Expand Down Expand Up @@ -1478,7 +1478,7 @@ define( [
$( document ).bind( "pageshow", resetActivePageHeight );
$( window ).bind( "throttledresize", resetActivePageHeight );

});//navReadyDeferred done callback
});//navreadyDeferred done callback

})( jQuery );
//>>excludeStart("jqmBuildExclude", pragmas.jqmBuildExclude);
Expand Down
2 changes: 1 addition & 1 deletion js/jquery.mobile.navigation.pushstate.js
Expand Up @@ -145,7 +145,7 @@ define( [ "jquery", "./jquery.mobile.navigation", "../external/requirejs/depend!
});

// We need to init when "mobileinit", "domready", and "navready" have all happened
$.when( domreadyDeferred, mobileinitDeferred, $.mobile.navReadyDeferred ).done( function() {
$.when( domreadyDeferred, mobileinitDeferred, $.mobile.navreadyDeferred ).done( function() {
if( $.mobile.pushStateEnabled && $.support.pushState ){
pushStateHandler.init();
}
Expand Down

0 comments on commit 9033a97

Please sign in to comment.