mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-08-07 22:33:50 +00:00
Code Issues Releases Wiki Activity

Fix modal dialogue to use inline parsing for header and footer

Browse Source
This commit is contained in:
Jeremy Ruston 2013-02-10 18:44:00 +00:00
parent 2c5b33d75e
commit 6c4a2a6026
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ Modal.prototype.display = function(title,options) {
} else { } else {
titleText = title; titleText = title;
} }
var headerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText), var headerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",titleText,{parseAsInline: true}),
headerRenderTree = new $tw.WikiRenderTree(headerParser,{wiki: $tw.wiki}); headerRenderTree = new $tw.WikiRenderTree(headerParser,{wiki: $tw.wiki});
headerRenderTree.execute({tiddlerTitle: title}); headerRenderTree.execute({tiddlerTitle: title});
headerRenderTree.renderInDom(headerTitle); headerRenderTree.renderInDom(headerTitle);
@ -101,7 +101,7 @@ Modal.prototype.display = function(title,options) {
} else { } else {
footerText = '<$button message="tw-close-tiddler" class="btn btn-primary">Close</$button>'; footerText = '<$button message="tw-close-tiddler" class="btn btn-primary">Close</$button>';
} }
var footerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText), var footerParser = this.wiki.parseText("text/vnd.tiddlywiki-run",footerText,{parseAsInline: true}),
footerRenderTree = new $tw.WikiRenderTree(footerParser,{wiki: $tw.wiki}); footerRenderTree = new $tw.WikiRenderTree(footerParser,{wiki: $tw.wiki});
footerRenderTree.execute({tiddlerTitle: title}); footerRenderTree.execute({tiddlerTitle: title});
footerRenderTree.renderInDom(modalFooterButtons); footerRenderTree.renderInDom(modalFooterButtons);
@ -152,7 +152,7 @@ Modal.prototype.display = function(title,options) {
$tw.utils.forceLayout(modalWrapper); $tw.utils.forceLayout(modalWrapper);
// Set final animated styles // Set final animated styles
$tw.utils.setStyle(modalBackdrop,[ $tw.utils.setStyle(modalBackdrop,[
{opacity: "1"} {opacity: "0.7"}
]); ]);
$tw.utils.setStyle(modalWrapper,[ $tw.utils.setStyle(modalWrapper,[
{transform: "translateY(0px)"} {transform: "translateY(0px)"}