mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-09 22:51:22 +00:00
GUACAMOLE-526: Update webapp to angular 1.6.9.
This commit is contained in:
@@ -26,6 +26,9 @@ angular.module('index').config(['$routeProvider', '$locationProvider',
|
||||
// Disable HTML5 mode (use # for routing)
|
||||
$locationProvider.html5Mode(false);
|
||||
|
||||
// Clear hash prefix to keep /#/thing/bat URL style
|
||||
$locationProvider.hashPrefix('');
|
||||
|
||||
/**
|
||||
* Attempts to re-authenticate with the Guacamole server, sending any
|
||||
* query parameters in the URL, along with the current auth token, and
|
||||
|
@@ -337,7 +337,7 @@ angular.module('index').config(['$provide', function($provide) {
|
||||
$delegate.apply(this, arguments).then(function patchTemplate(data) {
|
||||
|
||||
// Retrieve and apply all patches
|
||||
patchService.getPatches().success(function applyRetrievedPatches(patches) {
|
||||
patchService.getPatches().then(function applyRetrievedPatches(patches) {
|
||||
|
||||
// Parse HTML into DOM tree
|
||||
var root = $('<div></div>').html(data);
|
||||
|
41
guacamole/src/main/webapp/app/index/filters/arrayFilter.js
Normal file
41
guacamole/src/main/webapp/app/index/filters/arrayFilter.js
Normal file
@@ -0,0 +1,41 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
/**
|
||||
* A filter for transforming an object into an array of all non-inherited
|
||||
* property values.
|
||||
*/
|
||||
angular.module('index').filter('toArray', [function toArrayFactory() {
|
||||
|
||||
return function toArrayFiter(input) {
|
||||
|
||||
|
||||
console.log(input)
|
||||
|
||||
// If no object is available, just return an empty array
|
||||
if (!input) {
|
||||
return [];
|
||||
}
|
||||
|
||||
return Object.keys(input).map(function fetchValueByKey(key) {
|
||||
return input[key];
|
||||
});
|
||||
};
|
||||
|
||||
}]);
|
Reference in New Issue
Block a user