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

Call jquery event handlers in $scope.$apply

Browse Source 
This causes all sorts of strange race conditions when $location.path()
is changed by the hide and hidden events handlers
This commit is contained in:
Girish Ramakrishnan
2018-01-08 16:23:09 -08:00
parent af4296e40c
commit a53214cb29
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,9 +23,11 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
$scope.showView = function (view) {
// wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
$('.modal').on('hidden.bs.modal', function () {
$scope.appInstall.reset();
$('.modal').off('hidden.bs.modal');
$location.path(view);
$scope.$apply(function () {
$scope.appInstall.reset();
$('.modal').off('hidden.bs.modal');
$location.path(view);
});
});
$('.modal').modal('hide');
@@ -201,9 +203,9 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
switchToAppsView: function () {
// wait for dialog to be fully closed to avoid modal behavior breakage when moving to a different view already
$('#appInstallModal').on('hidden.bs.modal', function () {
$scope.appInstall.reset();
$('#appInstallModal').off('hidden.bs.modal');
$location.path('/apps');
$scope.$apply(function () {
$location.path('/apps').search({ });
});
});
$('#appInstallModal').modal('hide');
@@ -575,8 +577,12 @@ angular.module('Application').controller('AppStoreController', ['$scope', '$loca
Client.onReady(init);
$('#appInstallModal').on('hide.bs.modal', function () {
$location.path('/appstore', false).search({ version: undefined });
// note: do not use hide.bs.model since it is called immediately from switchToAppsView which is already in angular scope
$('#appInstallModal').on('hidden.bs.modal', function () {
// clear the appid and version in the search bar when dialog is cancelled
$scope.$apply(function () {
$location.path('/appstore', false).search({ }); // 'false' means do not reload
});
});
window.addEventListener('hashchange', hashChangeListener);