From 15cfed83f434c22819389c90d905efd67ad40d9f Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Thu, 2 Feb 2012 18:15:59 +0000 Subject: [PATCH] Restored operation of sliders in info macro Accidentally clobbered in the last refactoring --- js/macros/info.js | 29 ++++++++++++++++++------- tiddlywiki5/tiddlers/SimpleTemplate.tid | 1 + 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/js/macros/info.js b/js/macros/info.js index 33adc0451..d26a1aa53 100644 --- a/js/macros/info.js +++ b/js/macros/info.js @@ -15,6 +15,14 @@ exports.macro = { params: { info: {byName: "default", type: "text", optional: false} }, + events: { + click: function(event,node,tiddler,store,params) { + var el = node.firstChild.firstChild.nextSibling; + el.style.display = el.style.display === "block" ? "none" : "block"; + event.preventDefault(); + return false; + } + }, render: function(type,tiddler,store,params) { var encoder = type === "text/html" ? utils.htmlEncode : function(x) {return x;}, info = params.info || "parsetree"; @@ -22,18 +30,23 @@ exports.macro = { var parseTree = store.parseTiddler(tiddler.title); switch(info) { case "parsetree": - return utils.stitchSlider(type,"Parse tree","The parse tree for this tiddler",parseTree.toString(type)); + return utils.stitchSlider(type, + "Parse tree", + "The parse tree for this tiddler", + parseTree.toString(type)); //break; case "compiled": - return utils.stitchSlider(type,"Render functions","The render functions for this tiddler",parseTree.compile(type).toString(type)); + return utils.stitchSlider(type, + "Render functions", + "The render functions for this tiddler", + parseTree.compile(type).toString(type)); //break; case "dependencies": - if(parseTree.dependencies === null) { - return encoder("Dependencies: *"); - } else { - return encoder("Dependencies: " + parseTree.dependencies.join(", ")); - } - break; + return utils.stitchSlider(type, + "Dependencies", + "The dependencies for this tiddler", + (parseTree.dependencies === null) ? "*" : encoder(parseTree.dependencies.join(", "))); + //break; } } } diff --git a/tiddlywiki5/tiddlers/SimpleTemplate.tid b/tiddlywiki5/tiddlers/SimpleTemplate.tid index 09f82db3e..3d11c7ae0 100644 --- a/tiddlywiki5/tiddlers/SimpleTemplate.tid +++ b/tiddlywiki5/tiddlers/SimpleTemplate.tid @@ -8,4 +8,5 @@ modifier: JeremyRuston {{body{ <>}}} <> +<> <> \ No newline at end of file