Merge pull request #169 from easycoder/dev

Pass URL in to init iwsy

Author: easycoder

dist/plugins/iwsy.js

@@ -30,6 +30,15 @@ const EasyCoder_IWSY = {
 				}
 				break;
 			case `init`:
+				const cdn = compiler.nextValue();
+				compiler.addCommand({
+					domain: `iwsy`,
+					keyword: `iwsy`,
+					lino,
+					action,
+					cdn
+				});
+				return true;
 			case `stop`:
 				compiler.next();
 				compiler.addCommand({
@@ -164,15 +173,13 @@ const EasyCoder_IWSY = {
 			let script;
 			switch (action) {
 			case `init`:
-				program.require(`js`, `https://easycoder.github.io/iwsy/iwsy.js`,
+				const cdn = program.getValue(command.cdn);
+				program.require(`js`, `${cdn}/iwsy.js`,
 					function () {
 						program.run(command.pc + 1);
 					});
 				return 0;
 			case `load`:
-				// if (program.iwsyFunctions) {
-				// 	throw Error(`IWSY has already been set up`);
-				// }
 				const playerRecord = program.getSymbolRecord(command.player);
 				const player = playerRecord.element[playerRecord.index];
 				player.innerHTML = ``;

iwsy/iwsy.js

@@ -5,7 +5,6 @@ const IWSY = (playerElement, scriptObject) => {
 	let script = scriptObject;
 	let homeScript = script;
 	let afterRun;
-	let path;
 	let plugins;
 	let timeouts = [];
 	let intervals = [];
@@ -980,25 +979,35 @@ const IWSY = (playerElement, scriptObject) => {
 			const onStepCB = script.onStepCB;
 			if (step.action === `chain`) {
 				const runMode = script.runMode;
-				fetch(`${path}${step.script}?v=${Date.now()}`)
-					.then(response => {
-						if (response.status >= 400) {
-							throw Error(`Unable to load ${step.script}: ${response.status}`);
-						}
-						response.json().then(data => {
-							script = data;
-							if (onStepCB) {
-								onStepCB(-1);
+				if (step.mode === `static`) {
+					script = window.localStorage.getItem(step.script);
+					if (onStepCB) {
+						onStepCB(-1);
+					}
+					initScript();
+					script.runMode = runMode;
+					doStep(script.steps[1]);
+				} else {
+					fetch(`${script.path}${step.script}?v=${Date.now()}`)
+						.then(response => {
+							if (response.status >= 400) {
+								throw Error(`Unable to load ${step.script}: ${response.status}`);
 							}
-							initScript();
-							script.runMode = runMode;
-							doStep(script.steps[1]);
+							response.json().then(data => {
+								script = data;
+								if (onStepCB) {
+									onStepCB(-1);
+								}
+								initScript();
+								script.runMode = runMode;
+								doStep(script.steps[1]);
+							});
+						})
+						.catch(err => {
+							throw Error(`Fetch Error :${err}`);
 						});
-					})
-					.catch(err => {
-						throw Error(`Fetch Error :${err}`);
-					});
-				return;
+					return;
+				}
 			}
 
 			const actionName = step.action.split(` `).join(``);
@@ -1051,11 +1060,6 @@ const IWSY = (playerElement, scriptObject) => {
 		initScript();
 	};
 
-	// Set the path
-	const setPath = p => {
-		path = p;
-	};
-    
 	// Go to a specified step number
 	const gotoStep = target => {
 		script.scanTarget = target;

js/plugins/iwsy.js

@@ -30,6 +30,15 @@ const EasyCoder_IWSY = {
 				}
 				break;
 			case `init`:
+				const cdn = compiler.nextValue();
+				compiler.addCommand({
+					domain: `iwsy`,
+					keyword: `iwsy`,
+					lino,
+					action,
+					cdn
+				});
+				return true;
 			case `stop`:
 				compiler.next();
 				compiler.addCommand({
@@ -164,15 +173,13 @@ const EasyCoder_IWSY = {
 			let script;
 			switch (action) {
 			case `init`:
-				program.require(`js`, `https://easycoder.github.io/iwsy/iwsy.js`,
+				const cdn = program.getValue(command.cdn);
+				program.require(`js`, `${cdn}/iwsy.js`,
 					function () {
 						program.run(command.pc + 1);
 					});
 				return 0;
 			case `load`:
-				// if (program.iwsyFunctions) {
-				// 	throw Error(`IWSY has already been set up`);
-				// }
 				const playerRecord = program.getSymbolRecord(command.player);
 				const player = playerRecord.element[playerRecord.index];
 				player.innerHTML = ``;