mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-06 13:17:41 +00:00
GUACAMOLE-204: Don't unnecessarily hide the login box; use correct Angular objects to access window.
This commit is contained in:
committed by
Nick Couchman
parent
48baa5211e
commit
36297f4767
@@ -1,23 +0,0 @@
|
||||
/*
|
||||
* Licensed to the Apache Software Foundation (ASF) under one
|
||||
* or more contributor license agreements. See the NOTICE file
|
||||
* distributed with this work for additional information
|
||||
* regarding copyright ownership. The ASF licenses this file
|
||||
* to you under the Apache License, Version 2.0 (the
|
||||
* "License"); you may not use this file except in compliance
|
||||
* with the License. You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
|
||||
* KIND, either express or implied. See the License for the
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
/* Hide login dialog */
|
||||
.login-ui div.login-dialog {
|
||||
display: none;
|
||||
}
|
@@ -36,16 +36,17 @@ angular.module('guacCAS').config(['formServiceProvider',
|
||||
* Config block which augments the existing routing, providing special handling
|
||||
* for the "ticket=" fragments provided by OpenID Connect.
|
||||
*/
|
||||
angular.module('index').config(['$routeProvider',
|
||||
function indexRouteConfig($routeProvider) {
|
||||
angular.module('index').config(['$routeProvider','$windowProvider',
|
||||
function indexRouteConfig($routeProvider,$windowProvider) {
|
||||
|
||||
var curPath = window.location.href;
|
||||
var $window = $windowProvider.$get();
|
||||
var curPath = $window.location.href;
|
||||
var ticketPos = curPath.indexOf("?ticket=") + 8;
|
||||
var hashPos = curPath.indexOf("#/");
|
||||
if (ticketPos > 0 && ticketPos < hashPos) {
|
||||
var ticket = curPath.substring(ticketPos, hashPos);
|
||||
var newPath = curPath.substring(0,ticketPos - 8) + '#/?ticket=' + ticket;
|
||||
window.location = newPath;
|
||||
$window.location.href = newPath;
|
||||
}
|
||||
|
||||
}]);
|
||||
|
@@ -13,10 +13,6 @@
|
||||
"casModule.js",
|
||||
"casController.js",
|
||||
"casConfig.js"
|
||||
],
|
||||
|
||||
"css" : [
|
||||
"cas.css"
|
||||
]
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user