From 537c0901e3d8aa045f3e4540f2aecd40f4fb83ec Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Mon, 4 Jun 2012 13:39:10 +0100 Subject: [PATCH] Fixed JavaScript line comments to be parsed as text runs --- core/modules/parsers/javascriptparser/javascriptparser.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/modules/parsers/javascriptparser/javascriptparser.js b/core/modules/parsers/javascriptparser/javascriptparser.js index d5ec7b50f..c73539874 100644 --- a/core/modules/parsers/javascriptparser/javascriptparser.js +++ b/core/modules/parsers/javascriptparser/javascriptparser.js @@ -56,15 +56,13 @@ JavaScriptParser.prototype.parse = function(type,code) { element = "div"; classes.push("javascript-block-comment"); content.push($tw.Tree.Text("/*")); + content.push.apply(content,self.wiki.parseText("text/x-tiddlywiki",text).tree); + content.push($tw.Tree.Text("*/")); } else { element = "span"; classes.push("javascript-line-comment"); content.push($tw.Tree.Text("//")); - } - content.push.apply(content,self.wiki.parseText("text/x-tiddlywiki",text).tree); - if(comment.type === "Block") { - content.push($tw.Tree.Text("*/")); - } else { + content.push.apply(content,self.wiki.parseText("text/x-tiddlywiki-run",text).tree); content.push($tw.Tree.Text("\n")); } result.push($tw.Tree.Element(element,{"class": classes},content));