Use typeof instead of instanceof for built-in type detection, fix #27

y-lohse · Sep 21, 2016 · 432e757 · 432e757
1 parent 390c400
commit 432e757
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/engine/Story.js b/engine/Story.js
@@ -880,7 +880,7 @@ export class Story extends InkObject{
 	}
 	EvaluateFunction(functionName, textOutput, args){
 		//match the first signature of the function
-		if (textOutput instanceof String === false) return this.EvaluateFunction(functionName, '', textOutput);
+		if (typeof textOutput !== 'string') return this.EvaluateFunction(functionName, '', textOutput);
 
 		if (functionName == null) {
 			throw "Function is null";
@@ -916,7 +916,7 @@ export class Story extends InkObject{
 
 		if (args != null) {
 			for (var i = 0; i < args.Length; i++) {
-				if (!(args[i] instanceof Number || args[i] instanceof String)) {
+				if (!(typeof args[i] === 'number' || typeof args[i] === 'string')) {
 					throw "ink arguments when calling EvaluateFunction must be int, float or string";
 				}
 

diff --git a/engine/Value.js b/engine/Value.js
@@ -34,7 +34,7 @@ class AbstractValue extends InkObject{
 	}
 	static Create(val){
 		// Implicitly convert bools into ints
-		if (val instanceof Boolean){
+		if (typeof val === 'boolean'){
 			var b = !!val;
 			val = (b) ? 1 : 0;
 		}
@@ -43,7 +43,7 @@ class AbstractValue extends InkObject{
 			return new IntValue(val);
 		} else if (!isNaN(val)) {
 			return new FloatValue(val);
-		} else if (val instanceof String) {
+		} else if (typeof val === 'string') {
 			return new StringValue(val);
 		} else if (val instanceof Path) {
 			return new DivertTargetValue(val);