GUAC-807: Fixed connection parameter editing and made menu show on keydown instead of keyup.

2025-09-09 14:41:21 +00:00 · 2014-10-28 22:23:25 -07:00
parent 1b121ba665
commit 72c82aea8b
6 changed files with 333 additions and 25 deletions
--- a/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js
+++ b/guacamole/src/main/webapp/app/manage/directives/connectionParameter.js
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Glyptodon LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+/**
+ * A directive that allows editing of a connection parameter.
+ */
+angular.module('manage').directive('guacConnectionParameter', [function locationChooser() {
+    
+    return {
+        // Element only
+        restrict: 'E',
+        replace: true,
+        scope: {
+            parameter: '=parameter',
+            connection: '=connection',
+        },
+        templateUrl: 'app/manage/templates/connectionParameter.html',
+        controller: ['$scope', function connectionParameterController($scope) {
+            $scope.connectionParameters    = $scope.connection.parameters;
+            $scope.parameterType           = $scope.parameter.type;
+            $scope.parameterName           = $scope.parameter.name;
+                
+            // Coerce numeric strings to numbers
+            if($scope.parameterType === 'NUMERIC') {
+                $scope.connectionParameters[$scope.parameterName] = 
+                        Number($scope.connectionParameters[$scope.parameterName]) || 0;
+            // Coerce boolean strings to boolean values
+            } else if($scope.parameterType === 'BOOLEAN') {
+                $scope.connectionParameters[$scope.parameterName] = 
+                        $scope.connectionParameters[$scope.parameterName] === 'true';
+            }
+        }]
+    };
+    
+}]);