Merge remote-tracking branch 'refs/remotes/origin/dev'

engine/Story.js

@@ -446,7 +446,7 @@ export class Story extends InkObject{
 			return;
 
 		// First, find the previously open set of containers
-		if (this._prevContainerSet == null) this._prevContainerSet = [];
+		this._prevContainerSet = [];
 		if (previousContentObject) {
 //			Container prevAncestor = previousContentObject as Container ?? previousContentObject.parent as Container;
 			var prevAncestor = (previousContentObject instanceof Container) ? previousContentObject : previousContentObject.parent;

engine/StoryState.js

@@ -631,6 +631,8 @@ export class StoryState{
 		// Create a new base call stack element.
 		this.callStack = new CallStack(funcContainer);
 		this.callStack.currentElement.type = PushPopType.Function;
+
+		this._variablesState.callStack = this.callStack;
 
 		// By setting ourselves in external function evaluation mode,
 		// we're saying it's okay to end the flow without a Done or End,
@@ -673,6 +675,8 @@ export class StoryState{
 		this.callStack = this._originalCallstack;
 		this._originalCallstack = null;
 		this._originalEvaluationStackHeight = 0;
+
+		this._variablesState.callStack = this.callStack;
 
 		if (returnedObj) {
 			if (returnedObj instanceof Void)

engine/VariablesState.js

@@ -40,6 +40,12 @@ export class VariablesState{
 //			console.log("ES6 Proxy not available - direct manipulation of global variables can't work, use $() instead.");
 		}
 	}
+	get callStack(){
+		return this._callStack;
+	}
+	set callStack(callStack){
+		this._callStack = callStack;
+	}
 	get batchObservingVariableChanges(){
 		return this._batchObservingVariableChanges;
 	}

package.json

@@ -1,11 +1,11 @@
 {
   "name": "inkjs",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A javascript port of inkle's ink scripting language (http://www.inklestudios.com/ink/)",
   "main": "dist/ink-es2015.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build": "grunt rollup",
+    "build": "grunt rollup:release && grunt rollup:release_min && grunt rollup:legacy && grunt rollup:legacy_min",
     "watch": "grunt watch",
     "prepublish": "grunt rollup:release && grunt rollup:release_min && grunt rollup:legacy && grunt rollup:legacy_min"
   },