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

Ensure we show apps within an angular digest context

Browse Source 
This ensures the app is shown immediately, not only after
the next digest run happens
This commit is contained in:
Johannes
2016-11-21 12:30:09 +01:00
parent 00a4b7ba09
commit dd4f7bf176
1 changed files with 28 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -457,34 +457,37 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
};
function hashChangeListener() {
var appId = $location.path().slice('/appstore/'.length);
var version = $location.search().version;
// event listener is called from DOM not angular, need to use $apply
$scope.$apply(function () {
var appId = $location.path().slice('/appstore/'.length);
var version = $location.search().version;
if (appId) {
if (version) {
AppStore.getAppByIdAndVersion(appId, version, function (error, result) {
if (error) {
$scope.showAppNotFound(appId, version);
console.error(error);
return;
}
if (appId) {
if (version) {
AppStore.getAppByIdAndVersion(appId, version, function (error, result) {
if (error) {
$scope.showAppNotFound(appId, version);
console.error(error);
return;
}
$scope.appInstall.show(result);
});
} else {
var found = $scope.apps.filter(function (app) {
return (app.id === appId) && (version ? version === app.manifest.version : true);
});
if (found.length) {
$scope.appInstall.show(found[0]);
$scope.appInstall.show(result);
});
} else {
$scope.showAppNotFound(appId, null);
var found = $scope.apps.filter(function (app) {
return (app.id === appId) && (version ? version === app.manifest.version : true);
});
if (found.length) {
$scope.appInstall.show(found[0]);
} else {
$scope.showAppNotFound(appId, null);
}
}
} else {
$scope.appInstall.reset();
}
} else {
$scope.appInstall.reset();
}
});
}
function fetchUsers() {
@@ -548,7 +551,8 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.apps = apps;
// show install app dialog immediately if an app id was passed in the query
hashChangeListener();
// hashChangeListener calls $apply, so make sure we don't double digest here
setTimeout(hashChangeListener, 1);
if ($scope.user.admin) {
fetchUsers();