diff --git a/ChartingSpace/PlottersManager.js b/ChartingSpace/PlottersManager.js index aaf872484..4705b317a 100644 --- a/ChartingSpace/PlottersManager.js +++ b/ChartingSpace/PlottersManager.js @@ -163,7 +163,7 @@ function newPlottersManager() { let host = layer.networkNode.config.host let webPort = layer.networkNode.config.webPort - if (host === undefined) { host = 'localhost' } + if (host === undefined) { host = window.location.hostname } if (webPort === undefined) { webPort = window.location.port } let eventsServerClient = canvas.designSpace.workspace.eventsServerClients.get(layer.networkNode.id) diff --git a/Spaces/CockpitSpace.js b/Spaces/CockpitSpace.js index efb6c4213..588b7a9ef 100644 --- a/Spaces/CockpitSpace.js +++ b/Spaces/CockpitSpace.js @@ -72,7 +72,7 @@ function newCockpitSpace() { storage = JSON.parse(localStorage) thisObject.container.frame.position.y = storage.spacePosition } else { - INITIAL_POSITION = 55 + INITIAL_POSITION = browserCanvas.height - 55 thisObject.container.frame.position.y = browserCanvas.height * INITIAL_POSITION / 100 - COCKPIT_SPACE_HEIGHT } } else { @@ -109,7 +109,7 @@ function newCockpitSpace() { } function toTop() { - thisObject.container.frame.position.y = COCKPIT_SPACE_HEIGHT + thisObject.container.frame.position.y = TOP_SPACE_HEIGHT } function toBottom() { diff --git a/Spaces/TutorialSpace.js b/Spaces/TutorialSpace.js index 8e8cbba3e..829c7142d 100644 --- a/Spaces/TutorialSpace.js +++ b/Spaces/TutorialSpace.js @@ -60,7 +60,7 @@ function newTutorialSpace() { let positionAtNodeCounter = 0 let timeMachineKeyPressedCounter = 0 let keyPressedCounter = 0 - let sliderPositioned = 0 + let sliderCounter = 0 let changeNodeConfigCounter = 0 let changeNodeConfigCounterWithEval = 0 let documentationCounter = 0 @@ -314,8 +314,9 @@ function newTutorialSpace() { */ return } - if (sliderPositioned === false) { - sliderPositioned = true + sliderCounter++ + if (sliderCounter === 10 || sliderCounter === 100) { + switch (config.slider) { case "toTop": { /* @@ -791,7 +792,7 @@ function newTutorialSpace() { } function resetSlider() { - sliderPositioned = false + sliderCounter = 0 } function changeNodeConfig() { @@ -964,35 +965,37 @@ function newTutorialSpace() { function findNextNode(node) { - for (let i = 0; i < node.tutorialSteps.length; i++) { + if (node.tutorialSteps !== undefined) { + for (let i = 0; i < node.tutorialSteps.length; i++) { - let tutorialStep = node.tutorialSteps[i] - if (found === true) { - if (resumeModeActivated !== true) { - currentNode = tutorialStep - currentStatus = 'Playing Step' - advanced = true - navigationStack.push(currentNode) - findTutorialNode(currentNode) - return - } else { - let tutorial = { - status: undefined - } - loadTutorial(tutorialStep.payload, tutorial) - if (tutorial.status !== 'Done') { + let tutorialStep = node.tutorialSteps[i] + if (found === true) { + if (resumeModeActivated !== true) { currentNode = tutorialStep currentStatus = 'Playing Step' advanced = true navigationStack.push(currentNode) findTutorialNode(currentNode) return + } else { + let tutorial = { + status: undefined + } + loadTutorial(tutorialStep.payload, tutorial) + if (tutorial.status !== 'Done') { + currentNode = tutorialStep + currentStatus = 'Playing Step' + advanced = true + navigationStack.push(currentNode) + findTutorialNode(currentNode) + return + } } } - } - if (tutorialStep.id === currentNode.id) { - found = true - } + if (tutorialStep.id === currentNode.id) { + found = true + } + } } for (let i = 0; i < node.tutorialTopics.length; i++) {