From ecff17d86ebb2cedf37426b4a7178ab03a7764b6 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Fri, 8 Jan 2021 10:20:20 +0100 Subject: [PATCH] kbd working --- .../UI/Spaces/Docs-Space/DocumentPage.js | 8 ++ .../UI/Spaces/Tutorial-Space/TutorialSpace.js | 6 +- Projects/Superalgos/UI/Utilities/Docs.js | 84 +++++++++++++++++++ 3 files changed, 97 insertions(+), 1 deletion(-) diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js index 07b0fd900..b7e866355 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocumentPage.js @@ -1332,6 +1332,7 @@ function newSuperalgosDocsDocumentPage() { innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) innerHTML = UI.projects.superalgos.utilities.docs.addCodeToCamelCase(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addCodeToWhiteList(innerHTML) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1361,6 +1362,7 @@ function newSuperalgosDocsDocumentPage() { role = 'role="alert"' key = key + '-note' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1372,6 +1374,7 @@ function newSuperalgosDocsDocumentPage() { role = 'role="alert"' key = key + '-success' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1383,6 +1386,7 @@ function newSuperalgosDocsDocumentPage() { role = 'role="alert"' key = key + '-important' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1394,6 +1398,7 @@ function newSuperalgosDocsDocumentPage() { role = 'role="alert"' key = key + '-warning' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1415,6 +1420,7 @@ function newSuperalgosDocsDocumentPage() { role = '' key = key + '-callout' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1426,6 +1432,7 @@ function newSuperalgosDocsDocumentPage() { role = '' key = key + '-summary' innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) @@ -1450,6 +1457,7 @@ function newSuperalgosDocsDocumentPage() { innerHTML = UI.projects.superalgos.utilities.docs.getTextBasedOnLanguage(paragraph) innerHTML = UI.projects.superalgos.utilities.docs.addCodeToCamelCase(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addBold(innerHTML) + innerHTML = UI.projects.superalgos.utilities.docs.addKeyboard(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addItalics(innerHTML) innerHTML = UI.projects.superalgos.utilities.docs.addToolTips(innerHTML, UI.projects.superalgos.spaces.docsSpace.currentDocumentBeingRendered.type) innerHTML = innerHTML + UI.projects.superalgos.utilities.docs.addWarningIfTranslationIsOutdated(paragraph) diff --git a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js index 9cad03c41..856674d90 100644 --- a/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js +++ b/Projects/Superalgos/UI/Spaces/Tutorial-Space/TutorialSpace.js @@ -1239,7 +1239,7 @@ function newSuperalgosTutorialSpace() { let type = nodeConfig.gif.replaceAll("-", " ") type = UI.projects.superalgos.utilities.strings.allWordsToUpper(type) template.type = currentNode.type + ' - ' + type - template.definition.text = "This step will play a video full screen." + template.definition.text = "This step will play a video in full screen mode." let paragraph = { style: 'Gif', text: 'GIFs/Superalgos/Tutorials/' + nodeConfig.gif + '.gif' @@ -1259,6 +1259,10 @@ function newSuperalgosTutorialSpace() { .replaceAll('', '') .replaceAll('', '') .replaceAll('', '') + .replaceAll('', '') + .replaceAll('', '') + .replaceAll('', '') + .replaceAll('', '') .trim() return result } diff --git a/Projects/Superalgos/UI/Utilities/Docs.js b/Projects/Superalgos/UI/Utilities/Docs.js index a14c993cd..5190737f8 100644 --- a/Projects/Superalgos/UI/Utilities/Docs.js +++ b/Projects/Superalgos/UI/Utilities/Docs.js @@ -15,6 +15,7 @@ function newSuperalgosUtilitiesDocs() { reverseParseHierarchy: reverseParseHierarchy, reverseParseTable: reverseParseTable, addBold: addBold, + addKeyboard: addKeyboard, addCodeToCamelCase: addCodeToCamelCase, addCodeToWhiteList: addCodeToWhiteList, addItalics: addItalics, @@ -262,6 +263,89 @@ function newSuperalgosUtilitiesDocs() { } } + function addKeyboard(text) { + let expandedText = text + .replaceAll('{', ' { ') + .replaceAll('}', ' } ') + .replaceAll('(', ' ( ') + .replaceAll(')', ' ) ') + .replaceAll('[', ' [ ') + .replaceAll(']', ' ] ') + .replaceAll(',', ' , ') + .replaceAll('.', ' . ') + let splittedText = expandedText.split(' ') + let result = '' + for (let i = 0; i < splittedText.length; i++) { + let word = splittedText[i] + if ( + word === 'Ctrl' || + word === 'Alt' || + word === 'Shift' || + word === 'Cmd' || + word === 'F1' || + word === 'F2' || + word === 'F3' || + word === 'F4' || + word === 'F5' || + word === 'F6' || + word === 'F7' || + word === 'F8' || + word === 'F9' || + word === 'F10' || + word === 'F11' || + word === 'F12' || + word === 'Del' || + word === '←' || + word === '→' || + word === '↑' || + word === '↓' || + word === 'A' || + word === 'B' || + word === 'C' || + word === 'D' || + word === 'E' || + word === 'F' || + word === 'G' || + word === 'H' || + word === 'I' || + word === 'J' || + word === 'K' || + word === 'L' || + word === 'M' || + word === 'N' || + word === 'O' || + word === 'P' || + word === 'Q' || + word === 'R' || + word === 'S' || + word === 'T' || + word === 'U' || + word === 'V' || + word === 'W' || + word === 'X' || + word === 'Y' || + word === 'Z' + ) { + word = '' + word + '' + } + if (i === 0) { + result = word + } else { + result = result + ' ' + word + } + } + result = result + .replaceAll(' { ', '{') + .replaceAll(' } ', '}') + .replaceAll(' ( ', '(') + .replaceAll(' ) ', ')') + .replaceAll(' [ ', '[') + .replaceAll(' ] ', ']') + .replaceAll(' , ', ',') + .replaceAll(' . ', '.') + return result.trim() + } + function addCodeToCamelCase(text) { let expandedText = text .replaceAll('{', ' { ')