Merge pull request tweecode#8 from tmedwards/master

Updated the test play/start at passage feature to be header agnostic.
thedeadparrot · Dec 18, 2013 · f4c69ae · f4c69ae
2 parents 0dea8c5 + bc863da
commit f4c69ae
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 20 deletions.
diff --git a/targets/Responsive/header.html b/targets/Responsive/header.html
@@ -50,6 +50,8 @@
 
 "SUGARCANE"
 
+testplay = "START_AT";
+
 }());
 </script>
 <script title="modules">

diff --git a/targets/jonah/header.html b/targets/jonah/header.html
@@ -46,6 +46,8 @@
 
 "JONAH"
 
+testplay = "START_AT";
+
 // CssLexer/CssParser
 // Copyright (C) 2010 Google Inc.
 //
@@ -74,7 +76,7 @@
 <script title="modules">
 "JQUERY"
 "MODERNIZR"
-</script>
+</script>
 <style id="baseCSS">
 body {
 	background-color: #f8f8f8;
@@ -265,21 +267,21 @@
 }
 </style>
 <style id="storyCSS"></style>
-<style id="tagCSS"></style>
-</head>
+<style id="tagCSS"></style>
+</head>
 <body>
-<div id="floater"><div class="container">
-<div id="storyMenu"></div>
+<div id="floater"><div class="container">
+<div id="storyMenu"></div>
 <p><a id="restart" href="#">Restart Story</a></p>
-</div></div>
-<div id="content1"><div id="content2">
-<div id="header"></div><div id="titleLine"></div>
-<h1><span id="storyTitle"></span></h1>
-<h2><span id="storySubtitle"></span></h2>
+</div></div>
+<div id="content1"><div id="content2">
+<div id="header"></div><div id="titleLine"></div>
+<h1><span id="storyTitle"></span></h1>
+<h2><span id="storySubtitle"></span></h2>
 <h3><span id="storyAuthor"></span></h3>
-<div id="passages"><noscript><div id="noscript">Please enable Javascript to play this story!</div></noscript></div>
-<p id="footer">
-This story was created with <a class="externalLink" href="http://twinery.org/">Twine</a> and is powered by <a class="externalLink" href="http://www.tiddlywiki.com/">TiddlyWiki</a>.
-</p>
-</div></div>
+<div id="passages"><noscript><div id="noscript">Please enable Javascript to play this story!</div></noscript></div>
+<p id="footer">
+This story was created with <a class="externalLink" href="http://twinery.org/">Twine</a> and is powered by <a class="externalLink" href="http://www.tiddlywiki.com/">TiddlyWiki</a>.
+</p>
+</div></div>
 <div id="storeArea">"STORY"</div></body></html>
diff --git a/targets/sugarcane/header.html b/targets/sugarcane/header.html
@@ -47,6 +47,8 @@
 
 "SUGARCANE"
 
+testplay = "START_AT";
+
 }());
 </script>
 <script title="modules">

diff --git a/tiddlywiki.py b/tiddlywiki.py
@@ -107,17 +107,20 @@ def insertEngine(app, output, filename, label, extra = ''):
 		# Insert version number
 		output = output.replace('"VERSION"', "Made in " + app.NAME + " " + app.VERSION)
 
-		# Set up the test play variable
+		# Insert the test play "start at passage" value
 		if (startAt):
-			startAt = 'testplay = "' + startAt.replace('\\', r'\\').replace('"', '\"') + '";'
+			output = output.replace('"START_AT"', '"' + startAt.replace('\\', r'\\').replace('"', '\"') + '"')
+		else:
+			output = output.replace('"START_AT"', '""')
+
 		# Insert the main engine
-		output = insertEngine(app, output, 'engine.js', '"ENGINE"', startAt)
+		output = insertEngine(app, output, 'engine.js', '"ENGINE"')
 		if not output: return
 
 		# Insert Sugarcane/Jonah code if the storyformat is a Sugarcane/Jonah offshoot
-		output = insertEngine(app, output, 'sugarcane/code.js', '"SUGARCANE"', startAt)
+		output = insertEngine(app, output, 'sugarcane/code.js', '"SUGARCANE"')
 		if not output: return
-		output = insertEngine(app, output, 'jonah/code.js', '"JONAH"', startAt)
+		output = insertEngine(app, output, 'jonah/code.js', '"JONAH"')
 		if not output: return
 
 		falseOpts = ["false", "off", "0"]