From 741d25291f5b90492da5a7da705d720db2630381 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 28 Apr 2015 18:57:25 -0700 Subject: [PATCH] GUAC-1170: For sake of consistency, keyWidth should be keyWidths. --- .../src/main/webapp/modules/OnScreenKeyboard.js | 4 ++-- guacamole/src/main/webapp/layouts/en-us-qwerty.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js b/guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js index 96cd5f15f..3657843d3 100644 --- a/guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js +++ b/guacamole-common-js/src/main/webapp/modules/OnScreenKeyboard.js @@ -569,7 +569,7 @@ Guacamole.OnScreenKeyboard = function(layout) { // Add key to DOM, maintain scale div.appendChild(keyElement); - scaledElements.push(new ScaledElement(div, osk.layout.keyWidth[object] || 1, 1, true)); + scaledElements.push(new ScaledElement(div, osk.layout.keyWidths[object] || 1, 1, true)); } // end if object is key name @@ -650,7 +650,7 @@ Guacamole.OnScreenKeyboard.Layout = function(template) { * * @type Object. */ - this.keyWidth = template.keyWidth || {}; + this.keyWidths = template.keyWidths || {}; }; diff --git a/guacamole/src/main/webapp/layouts/en-us-qwerty.json b/guacamole/src/main/webapp/layouts/en-us-qwerty.json index 37152a94a..de0751708 100644 --- a/guacamole/src/main/webapp/layouts/en-us-qwerty.json +++ b/guacamole/src/main/webapp/layouts/en-us-qwerty.json @@ -371,7 +371,7 @@ }, - "keyWidth" : { + "keyWidths" : { "Back" : 2, "Tab" : 1.5,