v8: Fix for login screen title display (#7412)

This commit is contained in:
Rachel Breeze
2020-05-26 13:04:06 +01:00
committed by GitHub
parent f33b4b7be5
commit c3c98e2621
3 changed files with 9 additions and 5 deletions
+3 -3
View File
@@ -15313,9 +15313,9 @@
"integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
},
"tinymce": {
"version": "4.9.9",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.9.tgz",
"integrity": "sha512-7Wqh4PGSAWm6FyNwyI1uFAaZyzeQeiwd9Gg2R89SpFIqoMrSzNHIYBqnZnlDm4Bd2DJ0wcC6uJhwFrabIE8puw=="
"version": "4.9.10",
"resolved": "https://registry.npmjs.org/tinymce/-/tinymce-4.9.10.tgz",
"integrity": "sha512-vyzGG04Q44Y7zWIKA4c+G7MxMCsed6JkrhU+k0TaDs9XKAiS+e+D3Fzz5OIJ7p5keF7lbRK5czgI8T1JtouZqw=="
},
"tmp": {
"version": "0.0.33",
@@ -209,6 +209,7 @@
}
if (vm.loginForm.$invalid) {
SetTitle();
return;
}
@@ -257,6 +258,7 @@
vm.loginForm.password.$setValidity('auth', true);
}
});
SetTitle();
}
function requestPasswordResetSubmit(email) {
@@ -56,12 +56,14 @@ function MainController($scope, $location, appState, treeService, notificationsS
appState.setSearchState("show", false);
};
$scope.showLoginScreen = function(isTimedOut) {
$scope.showLoginScreen = function (isTimedOut) {
$scope.login.pageTitle = $scope.$root.locationTitle;
$scope.login.isTimedOut = isTimedOut;
$scope.login.show = true;
};
$scope.hideLoginScreen = function() {
$scope.hideLoginScreen = function () {
$scope.$root.locationTitle = $scope.login.pageTitle;
$scope.login.show = false;
};