yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

U4-11164 fixed blank screen for about 30 seconds after logging in. Because of q.all we don't need to wait until promise is resolved, because all promises are resolved when this is hit

Browse Source
This commit is contained in:
Dave Woestenborghs
2018-03-30 11:20:41 +02:00
parent 716020602d
commit 28a0e30315
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Web.UI.Client/src/common/services/user.service.js
View File

@@ -278,7 +278,7 @@ angular.module('umbraco.services')
/** Loads the Moment.js Locale for the current user. */
loadMomentLocaleForCurrentUser: function () {
var deferred = $q.defer();
function loadLocales(currentUser, supportedLocales) {
@@ -295,11 +295,9 @@ angular.module('umbraco.services')
}
}
assetsService.load(localeUrls).then(function () {
deferred.resolve(localeUrls);
});
} else {
deferred.resolve(['']);
}
}
}
var promises = {
@@ -307,11 +305,11 @@ angular.module('umbraco.services')
supportedLocales: javascriptLibraryService.getSupportedLocalesForMoment()
}
$q.all(promises).then(function (values) {
loadLocales(values.currentUser, values.supportedLocales);
return $q.all(promises).then(function (values) {
return loadLocales(values.currentUser, values.supportedLocales);
});
return deferred.promise;
},