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

Page container: the load method now correctly returns a promise #6901

Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions js/widgets/pagecontainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -658,7 +658,7 @@ define( [
this._getBase().set(url);
}

return;
return deferred.promise();
}

triggerData = {
Expand All @@ -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 ) {
Expand All @@ -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.
Expand All @@ -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 ) {
Expand Down