mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-12-05 00:08:06 +00:00
Code Issues Releases Wiki Activity

Refinements to 87fa7f972c

Browse Source
This commit is contained in:
Jermolene
2016-10-18 16:39:18 +01:00
parent 5aba7292e7
commit 8e02bde938
5 changed files with 57 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -81,14 +81,16 @@ Modal.prototype.display = function(title,options) {
}}}],
parentWidget: $tw.rootWidget,
document: document,
variables: variables
variables: variables,
importPageMacros: true
});
headerWidgetNode.render(headerTitle,null);
// Render the body of the message
var bodyWidgetNode = this.wiki.makeTranscludeWidget(title,{
parentWidget: $tw.rootWidget,
document: document,
variables: variables
variables: variables,
importPageMacros: true
});
bodyWidgetNode.render(modalBody,null);
// Setup the link if present
@@ -128,7 +130,8 @@ Modal.prototype.display = function(title,options) {
]}],
parentWidget: $tw.rootWidget,
document: document,
variables: variables
variables: variables,
importPageMacros: true
});
footerWidgetNode.render(modalFooterButtons,null);
// Set up the refresh handler

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

@@ -41,7 +41,11 @@ Notifier.prototype.display = function(title,options) {
// Create the variables
var variables = $tw.utils.extend({currentTiddler: title},options.variables);
// Render the body of the notification
var widgetNode = this.wiki.makeTranscludeWidget(title,{parentWidget: $tw.rootWidget, document: document, variables: variables});
var widgetNode = this.wiki.makeTranscludeWidget(title,{
parentWidget: $tw.rootWidget,
document: document,
variables: variables,
importPageMacros: true});
widgetNode.render(notification,null);
refreshHandler = function(changes) {
widgetNode.refresh(changes,notification,null);