lee/caprover
1
0
Fork 0
mirror of https://github.com/caprover/caprover synced 2026-05-29 14:50:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed flashing issue of logged out page

Browse Source
This commit is contained in:
Kasra Bigdeli
2018-02-07 22:35:53 -08:00
parent adffcba20f
commit c8b044887a
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app-backend/dist/js/dashboard.min.js
Vendored
+3 -1
View File
@@ -1343,6 +1343,8 @@ angular.module('RDash')
function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions
, $location, apiManager) {
$scope.isFullPage = true;
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
$scope.routePath = toState.url;
@@ -1350,7 +1352,7 @@ function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions
for (var count = 0; count < pageDefinitions.length; count++) {
if (pageDefinitions[count].url == toState.url){
$scope.pageName = pageDefinitions[count].name;
$scope.isFullPage = pageDefinitions[count].isFullPage;
$scope.isFullPage = pageDefinitions[count].isFullPage || !apiManager.isLoggedIn();
}
}
});
app-frontend/src/js/controllers/master-ctrl.js
+3 -1
View File
@@ -8,6 +8,8 @@ angular.module('RDash')
function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions
, $location, apiManager) {
$scope.isFullPage = true;
$rootScope.$on('$stateChangeStart', function (event, toState, toParams, fromState, fromParams) {
$scope.routePath = toState.url;
@@ -15,7 +17,7 @@ function MasterCtrl($scope, $cookieStore, $rootScope, pageDefinitions
for (var count = 0; count < pageDefinitions.length; count++) {
if (pageDefinitions[count].url == toState.url){
$scope.pageName = pageDefinitions[count].name;
$scope.isFullPage = pageDefinitions[count].isFullPage;
$scope.isFullPage = pageDefinitions[count].isFullPage || !apiManager.isLoggedIn();
}
}
});