Merge pull request tweecode#2 from tmedwards/master

Fixes for <<print>> and <<choice>>
thedeadparrot · Oct 22, 2013 · e1b4b41 · e1b4b41
2 parents b65490d + 244480c
commit e1b4b41
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/targets/Responsive/header.html b/targets/Responsive/header.html
@@ -336,7 +336,8 @@
 };
 macros.choice = {
     handler: function (a, b, c) {
-        Wikifier.createInternalLink(a, c[0])
+        var el = Wikifier.createInternalLink(a, c[0]);
+        el.innerHTML = c[0];
     }
 };
 }());

diff --git a/targets/engine.js b/targets/engine.js
@@ -352,7 +352,7 @@ macros['print'] = {
     handler: function (place, macroName, params, parser) {
         try {
             var output = eval(parser.fullArgs());
-            if (output != null || !isNaN(output)) {
+            if (output != null && (typeof output !== "number" || !isNaN(output))) {
                 new Wikifier(place, output.toString());
             }
         } catch (e) {
@@ -1423,4 +1423,4 @@ function main() {
         addStyle(styles[i].text);
     }
     state.init();
-};
+};
diff --git a/targets/sugarcane/header.html b/targets/sugarcane/header.html
@@ -329,7 +329,8 @@
 };
 macros.choice = {
     handler: function (a, b, c) {
-        Wikifier.createInternalLink(a, c[0])
+        var el = Wikifier.createInternalLink(a, c[0]);
+        el.innerHTML = c[0];
     }
 };
 }());