From 66779543c421f4df8767a30365332b976e43a5c9 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 4 Jan 2015 18:11:32 -0800 Subject: [PATCH] GUAC-975: Always hide status dialogs upon navigation. --- .../main/webapp/app/client/controllers/clientController.js | 3 --- .../src/main/webapp/app/index/controllers/indexController.js | 5 +++++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/guacamole/src/main/webapp/app/client/controllers/clientController.js b/guacamole/src/main/webapp/app/client/controllers/clientController.js index 1614524b9..b613838e4 100644 --- a/guacamole/src/main/webapp/app/client/controllers/clientController.js +++ b/guacamole/src/main/webapp/app/client/controllers/clientController.js @@ -517,9 +517,6 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams } - // Hide any status dialog - $scope.showStatus(false); - }); }]); diff --git a/guacamole/src/main/webapp/app/index/controllers/indexController.js b/guacamole/src/main/webapp/app/index/controllers/indexController.js index e5e298f84..3e7f1e733 100644 --- a/guacamole/src/main/webapp/app/index/controllers/indexController.js +++ b/guacamole/src/main/webapp/app/index/controllers/indexController.js @@ -198,12 +198,17 @@ angular.module('index').controller('indexController', ['$scope', '$injector', // Update title and CSS class upon navigation $scope.$on('$routeChangeSuccess', function(event, current, previous) { + // Set title var title = current.$$route.title; if (title) $scope.page.title = title; + // Set body CSS class $scope.page.bodyClassName = current.$$route.bodyClassName || ''; + // Hide any status dialog + $scope.showStatus(false); + }); }]);