mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-09-10 14:56:06 +00:00
Code Issues Releases Wiki Activity

Make modal wizards work again

Browse Source
This commit is contained in:
Jeremy Ruston
2013-01-03 17:06:14 +00:00
parent bab43fe6c2
commit 5755cd5d3f
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/modules/utils/dom/modal.js
View File

@@ -38,6 +38,10 @@ Modal.prototype.display = function(title,options) {
modalFooterButtons = document.createElement("span"), modalFooterButtons = document.createElement("span"),
tiddler = this.wiki.getTiddler(title), tiddler = this.wiki.getTiddler(title),
d = $tw.config.preferences.animationDuration + "ms"; d = $tw.config.preferences.animationDuration + "ms";
// Don't do anything if the tiddler doesn't exist
if(!tiddler) {
return;
}
// Add classes // Add classes
$tw.utils.addClass(modalBackdrop,"modal-backdrop"); $tw.utils.addClass(modalBackdrop,"modal-backdrop");
$tw.utils.addClass(modalWrapper,"modal"); $tw.utils.addClass(modalWrapper,"modal");
@@ -61,18 +65,20 @@ Modal.prototype.display = function(title,options) {
} else { } else {
titleText = title; titleText = title;
} }
var headerRenderer = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText); var headerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText),
headerRenderer.execute([],title); headerRenderTree = new $tw.WikiRenderTree(headerParser,{wiki: $tw.wiki});
headerRenderer.renderInDom(headerTitle); headerRenderTree.execute({tiddlerTitle: title});
headerRenderTree.renderInDom(headerTitle);
this.wiki.addEventListener("",function(changes) { this.wiki.addEventListener("",function(changes) {
headerRenderer.refreshInDom(changes); headerRenderTree.refreshInDom(changes);
}); });
// Render the body of the message // Render the body of the message
var bodyRenderer = this.wiki.parseTiddler(title); var bodyParser = this.wiki.parseTiddler(title),
bodyRenderer.execute([],title); bodyRenderTree = new $tw.WikiRenderTree(bodyParser,{wiki: $tw.wiki});
bodyRenderer.renderInDom(modalBody); bodyRenderTree.execute({tiddlerTitle: title});
bodyRenderTree.renderInDom(modalBody);
this.wiki.addEventListener("",function(changes) { this.wiki.addEventListener("",function(changes) {
bodyRenderer.refreshInDom(changes); bodyRenderTree.refreshInDom(changes);
}); });
// Setup the link if present // Setup the link if present
if(options.downloadLink) { if(options.downloadLink) {
@@ -93,13 +99,14 @@ Modal.prototype.display = function(title,options) {
if(tiddler && tiddler.fields && tiddler.fields.footer) { if(tiddler && tiddler.fields && tiddler.fields.footer) {
footerText = tiddler.fields.footer; footerText = tiddler.fields.footer;
} else { } else {
footerText = "<<button close class:'btn btn-primary'><Close>>"; footerText = '<$button message="tw-close" class="btn btn-primary">Close</$button>';
} }
var footerRenderer = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText); var footerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText),
footerRenderer.execute([],title); footerRenderTree = new $tw.WikiRenderTree(footerParser,{wiki: $tw.wiki});
footerRenderer.renderInDom(modalFooterButtons); footerRenderTree.execute({tiddlerTitle: title});
footerRenderTree.renderInDom(modalFooterButtons);
this.wiki.addEventListener("",function(changes) { this.wiki.addEventListener("",function(changes) {
footerRenderer.refreshInDom(changes); footerRenderTree.refreshInDom(changes);
}); });
// Add the close event handler // Add the close event handler
wrapper.addEventListener("tw-close",function(event) { wrapper.addEventListener("tw-close",function(event) {

4
editions/tw5.com/tiddlers/Introduction.tid
View File

@@ -5,9 +5,9 @@ Here are a few features of TiddlyWiki that you can explore:
* Try editing some tiddlers here on five.tiddlywiki.com to try out the new WikiText. Your changes will not be visible to other users * Try editing some tiddlers here on five.tiddlywiki.com to try out the new WikiText. Your changes will not be visible to other users
* Download an empty copy of TiddlyWiki5 from http://five.tiddlywiki.com/empty.html * Download an empty copy of TiddlyWiki5 from http://five.tiddlywiki.com/empty.html
* Invoke a demonstration wizard: <<button modal param:[[SampleWizard]] class:"btn btn-inverse"><demo>> * Invoke a demonstration wizard: <$button message="tw-modal" param="SampleWizard" class="btn btn-inverse">demo</$button>
* Use TiddlySpot to host an instance of TiddlyWiki5 * Use TiddlySpot to host an instance of TiddlyWiki5
* Save this wiki as a static HTML file: <<button save-wiki param:"$:/core/templates/static.template.html" class:"btn"><Save Static>> * Save this wiki as a static HTML file: <$button message="tw-save-wiki" param="$:/core/templates/static.template.html" class="btn">Save Static</$button>
* Browse the list of AllTiddlers or the ShadowTiddlers * Browse the list of AllTiddlers or the ShadowTiddlers
* Examine the example [[bitmap images|Motovun Jack.jpg]] and [[SVG images|Motovun Jack.svg]] * Examine the example [[bitmap images|Motovun Jack.jpg]] and [[SVG images|Motovun Jack.svg]]
* Check out the TaskManagementExample * Check out the TaskManagementExample

6
editions/tw5.com/tiddlers/samples/SampleWizard.tid
View File

@@ -1,10 +1,10 @@
title: SampleWizard title: SampleWizard
tags: demo tags: demo
subtitle: I'm a modal wizard subtitle: I'm a modal wizard
footer: <<button close class:"btn btn-primary"><Close>> footer: <$button message="tw-close" class="btn btn-primary">Close</$button>
This is a modal wizard dialogue, stored in the tiddler SampleWizard. This is a modal wizard dialogue, stored in the tiddler SampleWizard.
[img[Motovun Jack.jpg]] {{Motovun Jack.jpg}}
You can <<button modal param:[[Introduction]] class:"btn btn-inverse"><nest wizards>>. You can <$button message="tw-modal" param="Introduction" class="btn btn-inverse">nest wizards</$button>.