1
0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-07-07 04:24:22 +00:00

Fixed problems with slider

This commit is contained in:
Jeremy Ruston 2012-02-06 11:31:23 +00:00
parent 94c4886ef4
commit 5406d00612
3 changed files with 14 additions and 11 deletions

View File

@ -123,7 +123,8 @@ Static method to construct a slider
*/ */
HTML.slider = function(type,label,tooltip,body) { HTML.slider = function(type,label,tooltip,body) {
var attributes = { var attributes = {
"class": "tw-slider" "class": "tw-slider",
"data-tw-slider-type": type
}; };
if(tooltip) { if(tooltip) {
attributes.alt = tooltip; attributes.alt = tooltip;
@ -141,7 +142,8 @@ HTML.slider = function(type,label,tooltip,body) {
), ),
HTML.elem("div", HTML.elem("div",
{ {
"class": ["tw-slider-body"] "class": ["tw-slider-body"],
"style": {"display": "none"}
}, },
body body
) )

View File

@ -31,22 +31,22 @@ exports.macro = {
var parseTree = store.parseTiddler(tiddler.title); var parseTree = store.parseTiddler(tiddler.title);
switch(info) { switch(info) {
case "parsetree": case "parsetree":
return HTML(HTML.slider(type, return HTML(HTML.slider("parsetree",
"Parse tree", "Parse tree",
"The parse tree for this tiddler", "The parse tree for this tiddler",
parseTree.toString(type)),type); HTML.raw(parseTree.toString(type))),type);
//break; //break;
case "compiled": case "compiled":
return HTML(HTML.slider(type, return HTML(HTML.slider("compiled",
"Render functions", "Render functions",
"The render functions for this tiddler", "The render functions for this tiddler",
parseTree.compile(type).toString(type)),type); HTML.raw(parseTree.compile(type).toString(type))),type);
//break; //break;
case "dependencies": case "dependencies":
return HTML(HTML.slider(type, return HTML(HTML.slider("dependencies",
"Dependencies", "Dependencies",
"The dependencies for this tiddler", "The dependencies for this tiddler",
(parseTree.dependencies === null) ? "*" : encoder(parseTree.dependencies.join(", "))),type); HTML.raw((parseTree.dependencies === null) ? "*" : encoder(parseTree.dependencies.join(", ")))),type);
//break; //break;
} }
} }

View File

@ -7,7 +7,8 @@ title: js/macros/slider.js
/*jslint node: true */ /*jslint node: true */
"use strict"; "use strict";
var utils = require("../Utils.js"); var HTML = require("../HTML.js").HTML,
utils = require("../Utils.js");
exports.macro = { exports.macro = {
name: "slider", name: "slider",
@ -28,10 +29,10 @@ exports.macro = {
}, },
render: function(type,tiddler,store,params) { render: function(type,tiddler,store,params) {
if(type === "text/html") { if(type === "text/html") {
return utils.stitchSlider(type, return HTML(HTML.slider(params.name,
params.label, params.label,
params.tooltip, params.tooltip,
store.renderTiddler(type,params.targetTiddler)); HTML.raw(store.renderTiddler(type,params.targetTiddler))),type);
} else if(type === "text/plain") { } else if(type === "text/plain") {
return store.renderTiddler(type,params.target); return store.renderTiddler(type,params.target);
} }