From ed81cf7690b87e646477f55af0c3d6fe89400c74 Mon Sep 17 00:00:00 2001 From: mk747gx Date: Wed, 8 Jan 2014 10:47:18 +0100 Subject: [PATCH 1/2] Page container: the load method now returns a promise to comply with the docs. Fixed #6900. pagecontainer("load") does not return promise --- js/widgets/pagecontainer.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js index d87365962e0..99afc2335b4 100644 --- a/js/widgets/pagecontainer.js +++ b/js/widgets/pagecontainer.js @@ -637,7 +637,7 @@ define( [ $.mobile.path.isEmbeddedPage(fileUrl) && !$.mobile.path.isFirstPageUrl(fileUrl) ) { deferred.reject( absUrl, settings ); - return; + return deferred.promise(); } // Reset base to the default document base @@ -658,7 +658,7 @@ define( [ this._getBase().set(url); } - return; + return deferred.promise(); } triggerData = { @@ -675,7 +675,7 @@ define( [ // If the default behavior is prevented, stop here! if ( pblEvent.deprecatedEvent.isDefaultPrevented() || pblEvent.event.isDefaultPrevented() ) { - return; + return deferred.promise(); } if ( settings.showLoadMsg ) { @@ -691,7 +691,7 @@ define( [ if ( !( $.mobile.allowCrossDomainPages || $.mobile.path.isSameDomain($.mobile.path.documentUrl, absUrl ) ) ) { deferred.reject( absUrl, settings ); - return; + return deferred.promise(); } // Load the new content. @@ -704,6 +704,8 @@ define( [ success: this._loadSuccess( absUrl, triggerData, settings, deferred ), error: this._loadError( absUrl, triggerData, settings, deferred ) }); + + return deferred.promise(); }, _loadError: function( absUrl, triggerData, settings, deferred ) { From afabafae387924910911defea675c547ff781aab Mon Sep 17 00:00:00 2001 From: Marcus Krahl Date: Wed, 8 Jan 2014 10:47:18 +0100 Subject: [PATCH 2/2] Page container: the load method now correctly returns a promise #6901 The API docs for version 1.4.0 state that the load method of the pagecontainer widget returns a promise. This commit adds this behaviour to the widget to comply with the docs Fixes #6900 --- js/widgets/pagecontainer.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/js/widgets/pagecontainer.js b/js/widgets/pagecontainer.js index d87365962e0..99afc2335b4 100644 --- a/js/widgets/pagecontainer.js +++ b/js/widgets/pagecontainer.js @@ -637,7 +637,7 @@ define( [ $.mobile.path.isEmbeddedPage(fileUrl) && !$.mobile.path.isFirstPageUrl(fileUrl) ) { deferred.reject( absUrl, settings ); - return; + return deferred.promise(); } // Reset base to the default document base @@ -658,7 +658,7 @@ define( [ this._getBase().set(url); } - return; + return deferred.promise(); } triggerData = { @@ -675,7 +675,7 @@ define( [ // If the default behavior is prevented, stop here! if ( pblEvent.deprecatedEvent.isDefaultPrevented() || pblEvent.event.isDefaultPrevented() ) { - return; + return deferred.promise(); } if ( settings.showLoadMsg ) { @@ -691,7 +691,7 @@ define( [ if ( !( $.mobile.allowCrossDomainPages || $.mobile.path.isSameDomain($.mobile.path.documentUrl, absUrl ) ) ) { deferred.reject( absUrl, settings ); - return; + return deferred.promise(); } // Load the new content. @@ -704,6 +704,8 @@ define( [ success: this._loadSuccess( absUrl, triggerData, settings, deferred ), error: this._loadError( absUrl, triggerData, settings, deferred ) }); + + return deferred.promise(); }, _loadError: function( absUrl, triggerData, settings, deferred ) {