From efbb7e98e3a29ce160b2845d63d2ad859a9cf86b Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Tue, 29 Dec 2020 16:17:53 +0100 Subject: [PATCH] Camel Case Fixed, and Delete --- .../Images/Docs-Menu/docs-delete.png | Bin 0 -> 3902 bytes Client/WebServer/index.html | 4 +- .../UI/Spaces/Docs-Space/DocsSpace.js | 41 ++++++++++++++++-- Projects/Superalgos/UI/Utilities/Strings.js | 33 ++++++++++++-- 4 files changed, 70 insertions(+), 8 deletions(-) create mode 100644 Client/WebServer/Images/Docs-Menu/docs-delete.png diff --git a/Client/WebServer/Images/Docs-Menu/docs-delete.png b/Client/WebServer/Images/Docs-Menu/docs-delete.png new file mode 100644 index 0000000000000000000000000000000000000000..2c31a2f3eeb19a36131aed5bbe4c69bdd0067622 GIT binary patch literal 3902 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 Yz_g5}|8t@P8lnqW;q7)6n!BI*4b`{_{Qv*} literal 0 HcmV?d00001 diff --git a/Client/WebServer/index.html b/Client/WebServer/index.html index 5a39693be..556a10ae1 100644 --- a/Client/WebServer/index.html +++ b/Client/WebServer/index.html @@ -178,8 +178,8 @@
-
- +
+
diff --git a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js index 64f2d4aa6..c29ea93d7 100644 --- a/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js +++ b/Projects/Superalgos/UI/Spaces/Docs-Space/DocsSpace.js @@ -39,6 +39,7 @@ function newSuperalgosDocSpace() { let textArea let selectedParagraph let selectedParagraphData = '' + let selectedParagraphIndex = '' let selectedParagraphHeight = 0 let objectBeingRendered let paragraphMap // Here we will store a map of paragraphs from the Docs Node, Concept or Topics Schema in order to find it when we need to update them. @@ -78,6 +79,7 @@ function newSuperalgosDocSpace() { function setUpContextMenu() { window.contextMenu = { editParagraph: editParagraph, + deleteParagraph: deleteParagraph, toJavascript: toJavascript, toJson: toJson, toText: toText, @@ -164,6 +166,14 @@ function newSuperalgosDocSpace() { } } + function deleteParagraph() { + if (selectedParagraphIndex === undefined) { return } + if (selectedParagraphIndex === 0) { return } + docsSchemaDocument.paragraphs.splice(selectedParagraphIndex, 1) + contextMenuForceOutClick() + renderDocumentPage() + } + function toJavascript() { let docSchemaParagraph = paragraphMap.get(selectedParagraph.id) docSchemaParagraph.style = 'Javascript' @@ -651,6 +661,9 @@ function newSuperalgosDocSpace() { } } } + + /* Reset this */ + selectedParagraphIndex = undefined /* Depending on the Style of Paragraph we will need to remove some info from the innerText. @@ -663,6 +676,14 @@ function newSuperalgosDocSpace() { } return true } + /* + Remeber the Selected Paragraph Index + */ + let splittedId = paragraphNode.id.split('-') + selectedParagraphIndex = splittedId[splittedId.length - 2] + /* + Check the style of the Paragraph + */ if (paragraphNode.id.indexOf('-text') >= 0) { selectedParagraphData = paragraphNode.innerText.trim() return true @@ -2863,8 +2884,8 @@ function newSuperalgosDocSpace() { role = '' key = key + '-text' innerHTML = getTextBasedOnLanguage(paragraph) - innerHTML = addToolTips(innerHTML) innerHTML = addCodeToCamelCase(innerHTML) + innerHTML = addToolTips(innerHTML) innerHTML = addItalics(innerHTML) innerHTML = innerHTML + addWarningIfTranslationIsOutdated(paragraph) break @@ -2981,9 +3002,9 @@ function newSuperalgosDocSpace() { role = '' key = key + '-list' innerHTML = getTextBasedOnLanguage(paragraph) + innerHTML = addCodeToCamelCase(innerHTML) innerHTML = addToolTips(innerHTML) innerHTML = addBold(innerHTML) - innerHTML = addCodeToCamelCase(innerHTML) innerHTML = addItalics(innerHTML) innerHTML = innerHTML + addWarningIfTranslationIsOutdated(paragraph) break @@ -3585,7 +3606,14 @@ function newSuperalgosDocSpace() { } function addCodeToCamelCase(text) { - let splittedText = text.split(' ') + let expandedText = text + .replaceAll('{',' { ') + .replaceAll('}',' } ') + .replaceAll('(',' ( ') + .replaceAll(')',' ) ') + .replaceAll('[',' [ ') + .replaceAll(']',' ] ') + let splittedText = expandedText.split(' ') let result = '' for (let i = 0; i < splittedText.length; i++) { let word = splittedText[i] @@ -3598,6 +3626,13 @@ function newSuperalgosDocSpace() { result = result + ' ' + word } } + result = result + .replaceAll(' { ','{') + .replaceAll(' } ','}') + .replaceAll(' ( ','(') + .replaceAll(' ) ',')') + .replaceAll(' [ ','[') + .replaceAll(' ] ',']') return result } diff --git a/Projects/Superalgos/UI/Utilities/Strings.js b/Projects/Superalgos/UI/Utilities/Strings.js index f4cd341f3..66f61f02b 100644 --- a/Projects/Superalgos/UI/Utilities/Strings.js +++ b/Projects/Superalgos/UI/Utilities/Strings.js @@ -17,11 +17,38 @@ function newSuperalgosUtilitiesStrings() { we will accept strings with numbers and dots, so that object paths test positive. */ - const result = /^[A-Za-z0-9.]+$/.test(text) + + /* Check that there are not invalid symbols */ + let result = /^[A-Za-z0-9.]+$/.test(text) if (result === false) { return false } - let character = text[0] - if (character !== character.toLowerCase()) { + /* Check that first char is a letter in lower case*/ + result = /^[a-z]+$/.test(text[0]) + if (result === false) { return false } + + let upperCaseDetected = false + let numbersDetected = false + let dotsDetected = false + for (let i = 1; i < text.length; i++) { + let character = text[i] + + result = /^[0-9]+$/.test(character) + if (result === true) { + numbersDetected = true + if (text[i - 1] === '.') { return false } + } + + result = /^[A-Z]+$/.test(character) + if (result === true) { + upperCaseDetected = true + if (text[i - 1] === '.') { return false } + } + + if (character === '.') { dotsDetected = true } + + } + /* Check that there is at lest one upper case before numbers or dots */ + if (upperCaseDetected === false) { return false } return true