Merge pull request #170 from easycoder/dev

Fix path problem

Author: easycoder

dist/plugins/iwsy.js

@@ -30,7 +30,7 @@ const EasyCoder_IWSY = {
 				}
 				break;
 			case `init`:
-				const cdn = compiler.nextValue();
+				const cdn = compiler.getNextValue();
 				compiler.addCommand({
 					domain: `iwsy`,
 					keyword: `iwsy`,
@@ -60,16 +60,16 @@ const EasyCoder_IWSY = {
 					return true;
 				}
 				return false;	
-			case `path`:	
-				const path = compiler.getNextValue();
-				compiler.addCommand({
-					domain: `iwsy`,
-					keyword: `iwsy`,
-					lino,
-					action,
-					path
-				});
-				return true;			
+			// case `path`:	
+			// 	const path = compiler.getNextValue();
+			// 	compiler.addCommand({
+			// 		domain: `iwsy`,
+			// 		keyword: `iwsy`,
+			// 		lino,
+			// 		action,
+			// 		path
+			// 	});
+			// 	return true;			
 			case `script`:
 				const script = compiler.getNextValue();
 				compiler.addCommand({
@@ -193,11 +193,11 @@ const EasyCoder_IWSY = {
 				}
 				program.iwsyFunctions = IWSY(player, script);
 				break;
-			case `path`:
-				if (program.iwsyFunctions) {
-					program.iwsyFunctions.setPath(program.getValue(command.path));
-				}
-				break;
+			// case `path`:
+			// 	if (program.iwsyFunctions) {
+			// 		program.iwsyFunctions.setPath(program.getValue(command.path));
+			// 	}
+			// 	break;
 			case `script`:
 				script = program.getValue(command.script);
 				try {

iwsy/iwsy.js

@@ -988,7 +988,7 @@ const IWSY = (playerElement, scriptObject) => {
 					script.runMode = runMode;
 					doStep(script.steps[1]);
 				} else {
-					fetch(`${script.path}${step.script}?v=${Date.now()}`)
+					fetch(`${step.path}${step.script}?v=${Date.now()}`)
 						.then(response => {
 							if (response.status >= 400) {
 								throw Error(`Unable to load ${step.script}: ${response.status}`);
@@ -1267,7 +1267,6 @@ const IWSY = (playerElement, scriptObject) => {
 	return {
 		getScript,
 		setScript,
-		setPath,
 		gotoStep,
 		block,
 		run,

js/plugins/iwsy.js

@@ -30,7 +30,7 @@ const EasyCoder_IWSY = {
 				}
 				break;
 			case `init`:
-				const cdn = compiler.nextValue();
+				const cdn = compiler.getNextValue();
 				compiler.addCommand({
 					domain: `iwsy`,
 					keyword: `iwsy`,
@@ -60,16 +60,16 @@ const EasyCoder_IWSY = {
 					return true;
 				}
 				return false;	
-			case `path`:	
-				const path = compiler.getNextValue();
-				compiler.addCommand({
-					domain: `iwsy`,
-					keyword: `iwsy`,
-					lino,
-					action,
-					path
-				});
-				return true;			
+			// case `path`:	
+			// 	const path = compiler.getNextValue();
+			// 	compiler.addCommand({
+			// 		domain: `iwsy`,
+			// 		keyword: `iwsy`,
+			// 		lino,
+			// 		action,
+			// 		path
+			// 	});
+			// 	return true;			
 			case `script`:
 				const script = compiler.getNextValue();
 				compiler.addCommand({
@@ -193,11 +193,11 @@ const EasyCoder_IWSY = {
 				}
 				program.iwsyFunctions = IWSY(player, script);
 				break;
-			case `path`:
-				if (program.iwsyFunctions) {
-					program.iwsyFunctions.setPath(program.getValue(command.path));
-				}
-				break;
+			// case `path`:
+			// 	if (program.iwsyFunctions) {
+			// 		program.iwsyFunctions.setPath(program.getValue(command.path));
+			// 	}
+			// 	break;
 			case `script`:
 				script = program.getValue(command.script);
 				try {