You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by mj...@apache.org on 2017/05/22 03:28:59 UTC
[04/23] incubator-guacamole-client git commit: GUACAMOLE-204: Don't
unnecessarily hide the login box;
use correct Angular objects to access window.
GUACAMOLE-204: Don't unnecessarily hide the login box; use correct Angular objects to access window.
Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/36297f47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/36297f47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/36297f47
Branch: refs/heads/master
Commit: 36297f4767e3cfff46ea3583ec1de306c2c09679
Parents: 48baa52
Author: Nick Couchman <vn...@apache.org>
Authored: Fri Feb 10 13:52:44 2017 -0500
Committer: Nick Couchman <ni...@yahoo.com>
Committed: Wed May 17 08:54:21 2017 -0400
----------------------------------------------------------------------
.../src/main/resources/cas.css | 23 --------------------
.../src/main/resources/casConfig.js | 9 ++++----
.../src/main/resources/guac-manifest.json | 4 ----
3 files changed, 5 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/36297f47/extensions/guacamole-auth-cas/src/main/resources/cas.css
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/cas.css b/extensions/guacamole-auth-cas/src/main/resources/cas.css
deleted file mode 100644
index dc83577..0000000
--- a/extensions/guacamole-auth-cas/src/main/resources/cas.css
+++ /dev/null
@@ -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;
-}
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/36297f47/extensions/guacamole-auth-cas/src/main/resources/casConfig.js
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js b/extensions/guacamole-auth-cas/src/main/resources/casConfig.js
index 77b0cbb..630a9d2 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/casConfig.js
+++ b/extensions/guacamole-auth-cas/src/main/resources/casConfig.js
@@ -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;
}
}]);
http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/36297f47/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
----------------------------------------------------------------------
diff --git a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
index 5bfb5f7..2561a32 100644
--- a/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
+++ b/extensions/guacamole-auth-cas/src/main/resources/guac-manifest.json
@@ -13,10 +13,6 @@
"casModule.js",
"casController.js",
"casConfig.js"
- ],
-
- "css" : [
- "cas.css"
]
}