Bug fixes

Author: graham-trott

iwsy/iwsy.js

@@ -180,10 +180,10 @@ const IWSY = (playerElement, scriptObject) => {
 	// Set the visibility of a block
 	const setVisibility = (block, showHide) => {
 		if (showHide) {
-			block.element.style.opacity = `1.0`;
+			// block.element.style.opacity = `1.0`;
 			block.element.style.display = `block`;
 		} else {
-			block.element.style.opacity = `0.0`;
+			// block.element.style.opacity = `0.0`;
 			block.element.style.display = `none`;
 		}
 	};
@@ -202,11 +202,7 @@ const IWSY = (playerElement, scriptObject) => {
 				}
 			}
 		}
-		if (script.runMode === `manual`) {
-			enterManualMode(step);
-		} else {
-			step.next();
-		}
+		step.next();
 	};
 
 	const show = step => {
@@ -266,12 +262,17 @@ const IWSY = (playerElement, scriptObject) => {
 		if (script.speed === `scan`) {
 			for (const block of stepBlocks)
 			{
-				setVisibility(step, block, showHide);
+				if (upDown) {
+					block.element.style.opacity = `1.0`;
+					block.element.style.display = `block`;
+				} else {
+					block.element.style.opacity = `0.0`;
+					block.element.style.display = `none`;
+				}
 			}
-			step.next();
 		} else {
 			const animSteps = Math.round(step.duration * 25);
-			const continueFlag = step.continue;
+			const continueFlag = step.continue === `yes`;
 			for (const block of stepBlocks)
 			{
 				block.element.style.display = `block`;
@@ -590,7 +591,7 @@ const IWSY = (playerElement, scriptObject) => {
 		} else {
 			const animSteps = Math.round(step.duration * 25);
 			let animStep = 0;
-			const continueFlag = step.continue;
+			const continueFlag = step.continue === `yes`;
 			const interval = setInterval(() => {
 				if (animStep < animSteps) {
 					const ratio =  0.5 - Math.cos(Math.PI * animStep / animSteps) / 2;
@@ -694,10 +695,11 @@ const IWSY = (playerElement, scriptObject) => {
 
 	// Scan the script
 	const scan = () => {
-		script.speed = `scan`;
 		removeBlocks();
 		setupBlocks();
 		player.innerHTML = ``;
+		initScript();
+		script.speed = `scan`;
 		doStep(script.steps[0]);
 	};
 
@@ -900,6 +902,7 @@ const IWSY = (playerElement, scriptObject) => {
 		script.labels = {};
 		script.stop = false;
 		script.vfxElements = [];
+		script.scanFinished = false;
 		removeStyles();
 		for (const block of script.blocks) {
 			const element = block.element;
@@ -917,17 +920,25 @@ const IWSY = (playerElement, scriptObject) => {
 			if (index < script.steps.length - 1) {
 				const nextStep = script.steps[step.index + 1];
 				step.next = () => {
-					if (script.runMode == `auto` || script.speed === `scan`) {
-						setTimeout(() => {
-							if (script.stop) {
-								script.stop = false;
-								restoreCursor();
-							} else {
-								doStep(nextStep);
-							}
-						}, 0);
+					if (script.scanFinished) {
+						script.scanFinished = false;
 					} else {
-						doStep(nextStep);
+						if (script.speed === `scan` && nextStep.index === script.scanTarget) {
+							script.speed = `normal`;
+							script.scanFinished = true;
+						}
+						if (script.runMode == `auto` || script.speed === `scan`) {
+							setTimeout(() => {
+								if (script.stop) {
+									script.stop = false;
+									restoreCursor();
+								} else {
+									doStep(nextStep);
+								}
+							}, 0);
+						} else {
+							doStep(nextStep);
+						}
 					}
 				};
 			}
@@ -967,14 +978,6 @@ const IWSY = (playerElement, scriptObject) => {
 			} else {
 				console.log(`Step ${step.index}: ${step.action}`);
 			}
-			if (script.speed === `scan` && step.index === script.scanTarget) {
-				script.speed = `normal`;
-				for (const block of script.blocks) {
-					if (block.element) {
-						block.element.style.display = `block`;
-					}
-				}
-			}
 
 			const onStepCB = script.onStepCB;
 			if (step.action === `chain`) {

iwsy/resources/ecs/blocks.txt

@@ -36,29 +36,16 @@
     variable N
     variable M
     variable NBlocks
-    variable Args
-    variable Protocol
-    variable Domain
     variable IsHome
     variable CDN
 
-    json parse url the location as Args
-    put property `protocol` of Args into Protocol
-    put property `domain` of Args into Domain
-    if Domain is `iwannashowyou.com`
-    begin
-    	put `https://easycoder.github.io/iwsy/resources` into CDN
-    	set IsHome
-    end
-    else
-    	put Protocol cat Domain cat `/resources` into CDN
-    	clear IsHome
-    end
+    get IsHome from storage as `.ishome`
+    get CDN from storage as `.cdn`
 
     put -1 into SelectedBlock
 
-    rest get PropertyNames from CDN cat `/json/propertyNames.json`
-    rest get PropertyDefaults from CDN cat `/json/propertyDefaults.json`
+    rest get PropertyNames from CDN cat `/resources/json/propertyNames.json`
+    rest get PropertyDefaults from CDN cat `/resources/json/propertyDefaults.json`
 
     on message go to Start
     set ready

iwsy/resources/ecs/fileman.txt

@@ -47,14 +47,9 @@
     variable Item
     variable Post
 
-    json parse url the location as Args
-    put property `domain` of Args into Domain
-    if Domain is `iwannashowyou.com` set IsHome 
-    else clear IsHome
-!	If the debug flag is set use admin storage
-    get Item from storage as `debug`
-    if Item is `true` clear IsHome
-    get AdminPassword from storage as `.password`
+    get IsHome from storage as `.ishome`
+    get CDN from storage as `.cdn`
+	get AdminPassword from storage as `.password`
 
     if portrait
     begin

iwsy/resources/ecs/help.txt

@@ -22,27 +22,11 @@
     variable Item
     variable Len
     variable N
-    variable Args
-    variable Protocol
-    variable Domain
     variable IsHome
     variable CDN
 
-    json parse url the location as Args
-    put property `protocol` of Args into Protocol
-    put property `domain` of Args into Domain
-    if Domain is `iwannashowyou.com`
-    begin
-    	put `https://easycoder.github.io/iwsy/resources` into CDN
-    	set IsHome
-    end
-    else
-    	put Protocol cat Domain cat `/resources` into CDN
-    	clear IsHome
-    end
-!	If the debug flag is set use admin storage
-    get Item from storage as `debug`
-    if Item clear IsHome
+    get IsHome from storage as `.ishome`
+    get CDN from storage as `.cdn`
 
     if portrait
     begin
@@ -80,7 +64,7 @@ GetPage:
 	put 0 into ImageCount
 	put 0 into LinkCount
     iwsy remove styles
-    rest get Content from CDN cat `/help/` cat Page cat `.md?v=` cat now
+    rest get Content from CDN cat `/resources/help/` cat Page cat `.md?v=` cat now
     or begin
     	put empty into Page
         go to GetPage
@@ -111,7 +95,7 @@ GetPage:
         add 1 to N
         put left N of Data into Data
     	iwsy load Player Embed
-        iwsy path Data
+!        iwsy path Data
         iwsy run
     end
     stop
@@ -122,7 +106,7 @@ GetPage:
 !	Decorate is called for every occurrence of ~...~ in the topic data
 Decorate:
     put the payload of DecoratorCallback into Payload
-    if Payload is `iwsy` put `<img src="` cat CDN cat `/icon/iwsy.png?v=` cat now cat `" `
+    if Payload is `iwsy` put `<img src="` cat CDN cat `/resources/icon/iwsy.png?v=` cat now cat `" `
     	cat `style="height:0.8em;position:relative;top:0.1em" />` into Payload
     else if Payload is `clear` put `<div style="height:1px;clear:both"></div>` into Payload
     else