Floorplan Updated

wwwroot/scripts/js/keyboards.js

@@ -17,8 +17,8 @@ let showVirtualNumpad = (heading, maxlength = 4, isPassword, allowDecimals = tru
     numpad.data('submitfunction', submitFunction);
     numpad.data('password', isPassword);
     numpad.data('allowdecimals', allowDecimals);
-    $(document).unbind('keyup');
-    $(document).keyup(e => {
+    $(document).off('keyup');
+    $(document).on('keyup', e => {
         let key = e.key;
         switch (key) {
             case 'Backspace':
@@ -52,7 +52,6 @@ let virtualNumpadInput = (input) => {
     let submitFunction = numpad.data('submitfunction');
     let allowedValues = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'submit', 'clear'];
     let currentValue = numpad.data('value').toString();
-    //Test
     if (allowDecimals)
         allowedValues.push('.', ',');
     let validInput = allowedValues.includes(input);
@@ -91,11 +90,12 @@ let setupVirtualNumpad = () => {
         hideVirtualNumpad();
     });
 };
-let setupVirtualKeyboard = () => {
+let setupVirtualKeyboard = (keyboardLayouts) => {
     Application.keyboard = {
         capsLock: false,
         shift: false,
-        layout: 'default'
+        layouts: keyboardLayouts,
+        currentLayout: 'default',
     };
     $(document).on('click', '.virtualKeyboardButton', e => {
         virtualKeyboardInput($(e.target).data('value'));
@@ -138,7 +138,7 @@ let virtualKeyboardInput = (input) => {
         case 'submit':
             hideVirtualKeyboard();
             let submitFunction = keyboard.data('submitfunction');
-            submitFunction();
+            submitFunction(inputBox.text());
             break;
         case 'shift':
             if (Application.keyboard.capsLock)
@@ -174,16 +174,17 @@ let virtualKeyboardInput = (input) => {
     }
 };
 let setKeyboardLayout = (layout, modifier = '') => {
-    let keyboardLayout = ajaxSync('/languages/english/keyboardLayout.json', null, 'get');
     if (modifier != '')
         modifier = `_${modifier}`;
+    Application.keyboard.currentLayout = layout;
+    let layoutToLoad = Application.keyboard.layouts[layout];
     $('.virtualKeyboardRow').each((index, row) => {
         /*
         We start at 1 instead of 0. Makes it easier for non-programmers
         and translators making their own language packs
         */
         index = index + 1;
-        let currentRow = keyboardLayout[layout]["row" + index + modifier];
+        let currentRow = layoutToLoad[`row${index}${modifier}`];
         $(row).children('a').each((keyIndex, button) => {
             let key = $(button);
             let keyValue = currentRow[keyIndex];
@@ -211,6 +212,6 @@ let setKeyboardLayout = (layout, modifier = '') => {
 };
 $(() => {
     setupVirtualNumpad();
-    setupVirtualKeyboard();
+    ajax('/ajax/getKeyboardLayout/english', null, 'get', setupVirtualKeyboard, null, null);
 });
 //# sourceMappingURL=keyboards.js.map