From be36726a9b01c99103f9ccb9ce50f96e47548212 Mon Sep 17 00:00:00 2001
From: Frode Langelo <frode@skytap.com>
Date: Mon, 6 Jul 2015 13:45:01 -0700
Subject: [PATCH] GUAC-1245: OSK Super and Menu keys are stuck together. Remove
 'super' modifier on Meny key so that these work independently and the context
 menu can be accessed from the Menu key

---
 guacamole/src/main/webapp/app/osk/styles/osk.css    | 3 +--
 guacamole/src/main/webapp/layouts/en-us-qwerty.json | 1 -
 guacamole/src/main/webapp/layouts/fr-fr-azerty.json | 1 -
 guacamole/src/main/webapp/layouts/ru-ru-qwerty.json | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/guacamole/src/main/webapp/app/osk/styles/osk.css b/guacamole/src/main/webapp/app/osk/styles/osk.css
index afc43b237..78554e113 100644
--- a/guacamole/src/main/webapp/app/osk/styles/osk.css
+++ b/guacamole/src/main/webapp/app/osk/styles/osk.css
@@ -116,8 +116,7 @@
 .guac-keyboard.guac-keyboard-modifier-caps .guac-keyboard-key-caps,
 
 /* Active super */
-.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key-super,
-.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key-menu {
+.guac-keyboard.guac-keyboard-modifier-super .guac-keyboard-key-super {
     background: #882;
     border-color: #DD4;
 }
diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.json b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
index fc7cdfcea..13b2ddb6c 100644
--- a/guacamole/src/main/webapp/layouts/en-us-qwerty.json
+++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.json
@@ -50,7 +50,6 @@
 
         "Menu" : [{
             "title"    : "Menu",
-            "modifier" : "super",
             "keysym"   : 65383
         }],
         "LShift" : [{
diff --git a/guacamole/src/main/webapp/layouts/fr-fr-azerty.json b/guacamole/src/main/webapp/layouts/fr-fr-azerty.json
index 7bfea626b..8b349fe6b 100644
--- a/guacamole/src/main/webapp/layouts/fr-fr-azerty.json
+++ b/guacamole/src/main/webapp/layouts/fr-fr-azerty.json
@@ -50,7 +50,6 @@
 
         "Menu" : [{
             "title"    : "Menu",
-            "modifier" : "super",
             "keysym"   : 65383
         }],
         "LShift" : [{
diff --git a/guacamole/src/main/webapp/layouts/ru-ru-qwerty.json b/guacamole/src/main/webapp/layouts/ru-ru-qwerty.json
index 8fc7348c6..7b5b57d52 100644
--- a/guacamole/src/main/webapp/layouts/ru-ru-qwerty.json
+++ b/guacamole/src/main/webapp/layouts/ru-ru-qwerty.json
@@ -50,7 +50,6 @@
 
         "Menu" : [{
             "title"    : "Menu",
-            "modifier" : "super",
             "keysym"   : 65383
         }],
         "LShift" : [{