From e44781ea98fd7c6a3b883938e8e43bdc3b83b362 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 21 Sep 2020 15:58:03 +0200 Subject: [PATCH] Update TutorialSpace.js --- Spaces/TutorialSpace.js | 110 ++++++++++++++++++++++++++++++---------- 1 file changed, 84 insertions(+), 26 deletions(-) diff --git a/Spaces/TutorialSpace.js b/Spaces/TutorialSpace.js index e2e25e3ba..67fb7cb99 100644 --- a/Spaces/TutorialSpace.js +++ b/Spaces/TutorialSpace.js @@ -3,7 +3,8 @@ function newTutorialSpace() { let thisObject = { stop: stop, skip: skip, - done: done, + previous: previous, + next: next, playTutorial: playTutorial, resumeTutorial: resumeTutorial, playTutorialTopic: playTutorialTopic, @@ -36,6 +37,7 @@ function newTutorialSpace() { let tutorialRootNode let currentNode let currentStatus = 'Stopped' + let navigationStack let tutorialDiv = document.getElementById('tutorialDiv') let tutorialFormDiv = document.getElementById('tutorialFormDiv') @@ -63,6 +65,7 @@ function newTutorialSpace() { tutorialRootNode = undefined currentNode = undefined + navigationStack = undefined tutorialDiv = undefined tutorialFormDiv = undefined @@ -293,29 +296,12 @@ function newTutorialSpace() { tutorialFormDiv.style = ' ' + 'position:fixed; top:' + (tutorialPosition.y + HEIGHT - FORM_HEIGHT) + 'px; ' + 'left:' + tutorialPosition.x + 'px; ' + - 'width: ' + WIDTH + 'px;' + + 'width: ' + (WIDTH + 20) + 'px;' + 'height: ' + FORM_HEIGHT + 'px;' + 'z-index:1;' } } - function playTutorial(node) { - node.payload.uiObject.isPlaying = true - tutorialRootNode = node - currentNode = node - currentStatus = 'Playing Tutorial' - resumeModeActivated = false - } - - function resumeTutorial(node) { - node.payload.uiObject.isPlaying = true - tutorialRootNode = node - currentNode = node - currentStatus = 'Playing Tutorial' - resumeModeActivated = true - advance() - } - function stop() { tutorialRootNode.payload.uiObject.isPlaying = false tutorialRootNode = undefined @@ -330,8 +316,37 @@ function newTutorialSpace() { advance() } - function done() { - if (ckeckGoingToAnotherTutorial() === true ) {return} + function previous() { + if (navigationStack.length > 1) { + let previousNode = navigationStack[navigationStack.length - 2] + switch (previousNode.type) { + case 'Tutorial': { + currentNode = previousNode + findTutorialNode(currentNode) + currentStatus = 'Playing Tutorial' + navigationStack.splice(navigationStack.length - 1) + break + } + case 'Tutorial Topic': { + currentNode = previousNode + findTutorialNode(currentNode) + currentStatus = 'Playing Topic' + navigationStack.splice(navigationStack.length - 1) + break + } + case 'Tutorial Step': { + currentNode = previousNode + findTutorialNode(currentNode) + currentStatus = 'Playing Step' + navigationStack.splice(navigationStack.length - 1) + break + } + } + } + } + + function next() { + if (ckeckGoingToAnotherTutorial() === true) { return } let tutorial = { status: 'Done' } @@ -343,41 +358,76 @@ function newTutorialSpace() { if (currentNode.payload !== undefined) { if (currentNode.payload.referenceParent !== undefined) { if (currentNode.payload.referenceParent.type === 'Tutorial') { - playTutorial(currentNode.payload.referenceParent) + tutorialRootNode = currentNode.payload.referenceParent + currentNode = currentNode.payload.referenceParent + currentStatus = 'Playing Tutorial' + resumeModeActivated = false + navigationStack.push(currentNode) + findTutorialNode(currentNode) + return true } } } } + function playTutorial(node) { + navigationStack = [] + node.payload.uiObject.isPlaying = true + tutorialRootNode = node + currentNode = node + currentStatus = 'Playing Tutorial' + resumeModeActivated = false + navigationStack.push(currentNode) + } + + function resumeTutorial(node) { + navigationStack = [] + node.payload.uiObject.isPlaying = true + tutorialRootNode = node + currentNode = node + currentStatus = 'Playing Tutorial' + resumeModeActivated = true + navigationStack.push(currentNode) + advance() + } + function playTutorialTopic(node) { + navigationStack = [] currentTopicNode = node currentNode = node currentStatus = 'Playing Topic' resumeModeActivated = false + navigationStack.push(currentNode) findTutorialNode(node) } function resumeTutorialTopic(node) { + navigationStack = [] currentTopicNode = node currentNode = node currentStatus = 'Playing Topic' resumeModeActivated = true + navigationStack.push(currentNode) findTutorialNode(node) } function playTutorialStep(node) { + navigationStack = [] currentStepNode = node currentNode = node currentStatus = 'Playing Step' resumeModeActivated = false + navigationStack.push(currentNode) findTutorialNode(node) } function resumeTutorialStep(node) { + navigationStack = [] currentStepNode = node currentNode = node currentStatus = 'Playing Step' resumeModeActivated = true + navigationStack.push(currentNode) findTutorialNode(node) } @@ -468,6 +518,8 @@ function newTutorialSpace() { currentNode = tutorialStep currentStatus = 'Playing Step' advanced = true + navigationStack.push(currentNode) + findTutorialNode(currentNode) return } else { let tutorial = { @@ -478,6 +530,8 @@ function newTutorialSpace() { currentNode = tutorialStep currentStatus = 'Playing Step' advanced = true + navigationStack.push(currentNode) + findTutorialNode(currentNode) return } } @@ -499,6 +553,8 @@ function newTutorialSpace() { currentNode = tutorialTopic currentStatus = 'Playing Topic' advanced = true + navigationStack.push(currentNode) + findTutorialNode(currentNode) return } else { let tutorial = { @@ -509,6 +565,8 @@ function newTutorialSpace() { currentNode = tutorialTopic currentStatus = 'Playing Topic' advanced = true + navigationStack.push(currentNode) + findTutorialNode(currentNode) return } } @@ -593,16 +651,16 @@ function newTutorialSpace() { html = html + '

' + nodeConfig.paragraph2 + '

' } if (nodeConfig.note !== undefined && nodeConfig.note !== '') { - html = html + '' + html = html + '' } if (nodeConfig.tip !== undefined && nodeConfig.tip !== '') { - html = html + '' + html = html + '' } if (nodeConfig.important !== undefined && nodeConfig.important !== '') { - html = html + '' + html = html + '' } if (nodeConfig.warning !== undefined && nodeConfig.warning !== '') { - html = html + '' + html = html + '' } html = html + ''