clone/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/TiddlyWiki/TiddlyWiki5.git synced 2026-05-02 04:27:00 +00:00
Code Issues Packages Projects 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"),
tiddler = this.wiki.getTiddler(title),
d = $tw.config.preferences.animationDuration + "ms";
// Don't do anything if the tiddler doesn't exist
if(!tiddler) {
return;
}
// Add classes
$tw.utils.addClass(modalBackdrop,"modal-backdrop");
$tw.utils.addClass(modalWrapper,"modal");
@@ -61,18 +65,20 @@ Modal.prototype.display = function(title,options) {
} else {
titleText = title;
}
var headerRenderer = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText);
headerRenderer.execute([],title);
headerRenderer.renderInDom(headerTitle);
var headerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText),
headerRenderTree = new $tw.WikiRenderTree(headerParser,{wiki: $tw.wiki});
headerRenderTree.execute({tiddlerTitle: title});
headerRenderTree.renderInDom(headerTitle);
this.wiki.addEventListener("",function(changes) {
headerRenderer.refreshInDom(changes);
headerRenderTree.refreshInDom(changes);
});
// Render the body of the message
var bodyRenderer = this.wiki.parseTiddler(title);
bodyRenderer.execute([],title);
bodyRenderer.renderInDom(modalBody);
var bodyParser = this.wiki.parseTiddler(title),
bodyRenderTree = new $tw.WikiRenderTree(bodyParser,{wiki: $tw.wiki});
bodyRenderTree.execute({tiddlerTitle: title});
bodyRenderTree.renderInDom(modalBody);
this.wiki.addEventListener("",function(changes) {
bodyRenderer.refreshInDom(changes);
bodyRenderTree.refreshInDom(changes);
});
// Setup the link if present
if(options.downloadLink) {
@@ -93,13 +99,14 @@ Modal.prototype.display = function(title,options) {
if(tiddler && tiddler.fields && tiddler.fields.footer) {
footerText = tiddler.fields.footer;
} 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);
footerRenderer.execute([],title);
footerRenderer.renderInDom(modalFooterButtons);
var footerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText),
footerRenderTree = new $tw.WikiRenderTree(footerParser,{wiki: $tw.wiki});
footerRenderTree.execute({tiddlerTitle: title});
footerRenderTree.renderInDom(modalFooterButtons);
this.wiki.addEventListener("",function(changes) {
footerRenderer.refreshInDom(changes);
footerRenderTree.refreshInDom(changes);
});
// Add the close event handler
wrapper.addEventListener("tw-close",function(event) {