jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Wrap all controller setup code with Client.onReady()

Browse Source 
This ensures we don't rely on timing for execution against a non
ready Client instance
This commit is contained in:
Johannes Zellner
2016-07-27 16:34:36 +02:00
parent b13dd55fc6
commit dfc0598ec9
4 changed files with 33 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
webadmin/src/views/appstore.js
View File

@@ -373,28 +373,31 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
});
}
(function refresh() {
$scope.ready = false;
Client.onReady(function () {
(function refresh() {
$scope.ready = false;
getAppList(function (error, apps) {
if (error) {
console.error(error);
return $timeout(refresh, 1000);
}
getAppList(function (error, apps) {
if (error) {
console.error(error);
return $timeout(refresh, 1000);
}
$scope.apps = apps;
$scope.apps = apps;
// show install app dialog immediately if an app id was passed in the query
hashChangeListener();
// show install app dialog immediately if an app id was passed in the query
hashChangeListener();
if ($scope.user.admin) {
fetchUsers();
fetchGroups();
}
if ($scope.user.admin) {
fetchUsers();
fetchGroups();
}
$scope.ready = true;
});
})();
$scope.ready = true;
});
})();
});
$('#appInstallModal').on('hide.bs.modal', function () {
$location.path('/appstore', false).search({ version: undefined });