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

y-lohse · Oct 14, 2016 · 52839d1 · 52839d1
2 parents 0ade0fe + 3cf84ef
commit 52839d1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/engine/Glue.js b/engine/Glue.js
@@ -1,5 +1,8 @@
-export class Glue{
+import {Object as InkObject} from './Object';
+
+export class Glue extends InkObject{
 	constructor(type){
+		super();
 		this.glueType = type;
 	}
 	get isLeft(){

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "inkjs",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A javascript port of inkle's ink scripting language (http://www.inklestudios.com/ink/)",
   "main": "dist/ink-es2015.js",
   "scripts": {

diff --git a/test/simple.html b/test/simple.html
@@ -2,7 +2,7 @@
 <!--	<script src="deps/require.js"></script>-->
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/es6-promise/3.2.2/es6-promise.js"></script>
 	<script src="https://cdnjs.cloudflare.com/ajax/libs/fetch/1.0.0/fetch.min.js"></script>
-	<script src="../dist/ink.iife.js"></script>
+	<script src="../dist/ink-es2015.js"></script>
 	<script>
 		fetch('stories/test.ink.json')
 		.then(function(response){
@@ -14,7 +14,7 @@
 
 		function initStory(inkFile){
 			var s = new inkjs.Story(inkFile);
-			continueToNextChoice();
+//			continueToNextChoice();
 
 			function continueToNextChoice(){
 				while (s.canContinue){

diff --git a/test/simple.js b/test/simple.js
@@ -19,7 +19,10 @@ var gameSave;
 continueToNextChoice();
 
 function continueToNextChoice(){
-	if (!s.canContinue && s.currentChoices.length === 0) end();
+	if (!s.canContinue && s.currentChoices.length === 0){
+		end();
+		return;
+	}
 
 	while (s.canContinue){
 		console.log(s.Continue());