mirror of
https://github.com/Jermolene/TiddlyWiki5
synced 2025-04-06 02:37:14 +00:00
Merge c4b805c2adecd8e4156170e07220aeabbd4dca47 into 961e74f73d230d0028efb586db07699120eac888
This commit is contained in:
Simon Huber
GitHub
commit
59bcf1744c
@ -47,14 +47,77 @@ exports.startup = function() {
|
||||
$tw.styleElement = document.createElement("style");
|
||||
$tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
|
||||
document.head.insertBefore($tw.styleElement,document.head.firstChild);
|
||||
$tw.wiki.addEventListener("change",$tw.perf.report("styleRefresh",function(changes) {
|
||||
if($tw.styleWidgetNode.refresh(changes,$tw.styleContainer,null)) {
|
||||
// Prepare refresh mechanism
|
||||
var mainDeferredChanges = Object.create(null),
|
||||
styleDeferredChanges = Object.create(null),
|
||||
mainTimerId,
|
||||
styleTimerId,
|
||||
throttledRefreshFn = function(changes,options) {
|
||||
options = options || {};
|
||||
// Check if only tiddlers that are throttled have changed
|
||||
var onlyThrottledTiddlersHaveChanged = true;
|
||||
var deferredChanges = options.mainCondition ? mainDeferredChanges : styleDeferredChanges;
|
||||
for(var title in changes) {
|
||||
var tiddler = $tw.wiki.getTiddler(title);
|
||||
if(!$tw.wiki.isVolatileTiddler(title) && (!tiddler || !(tiddler.hasField("draft.of") || tiddler.hasField("throttle.refresh") ||
|
||||
(options.mainCondition && tiddler.hasField("throttle.refresh.main")) || (options.styleCondition && tiddler.hasField("throttle.refresh.style"))))) {
|
||||
onlyThrottledTiddlersHaveChanged = false;
|
||||
}
|
||||
}
|
||||
// Defer the change if only drafts have changed
|
||||
if(options.mainCondition) {
|
||||
if(mainTimerId) {
|
||||
clearTimeout(mainTimerId);
|
||||
}
|
||||
mainTimerId = null;
|
||||
} else if(options.styleCondition) {
|
||||
if(styleTimerId) {
|
||||
clearTimeout(styleTimerId);
|
||||
}
|
||||
styleTimerId = null;
|
||||
}
|
||||
if(onlyThrottledTiddlersHaveChanged) {
|
||||
var timeout = parseInt($tw.wiki.getTiddlerText(DRAFT_TIDDLER_TIMEOUT_TITLE,""),10);
|
||||
if(isNaN(timeout)) {
|
||||
timeout = THROTTLE_REFRESH_TIMEOUT;
|
||||
}
|
||||
if(options.mainCondition) {
|
||||
mainTimerId = setTimeout(options.throttledRefresh,timeout);
|
||||
} else if(options.styleCondition) {
|
||||
styleTimerId = setTimeout(options.throttledRefresh,timeout);
|
||||
}
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
} else {
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
options.callback();
|
||||
}
|
||||
};
|
||||
function refresh() {
|
||||
// Process the refresh
|
||||
$tw.hooks.invokeHook("th-page-refreshing");
|
||||
$tw.pageWidgetNode.refresh(mainDeferredChanges);
|
||||
mainDeferredChanges = Object.create(null);
|
||||
$tw.hooks.invokeHook("th-page-refreshed");
|
||||
}
|
||||
function styleRefresh() {
|
||||
if($tw.styleWidgetNode.refresh(styleDeferredChanges,$tw.styleContainer,null)) {
|
||||
var newStyles = $tw.styleContainer.textContent;
|
||||
if(newStyles !== $tw.styleWidgetNode.assignedStyles) {
|
||||
$tw.styleWidgetNode.assignedStyles = newStyles;
|
||||
$tw.styleElement.innerHTML = $tw.styleWidgetNode.assignedStyles;
|
||||
}
|
||||
}
|
||||
styleDeferredChanges = Object.create(null);
|
||||
}
|
||||
var mainThrottledRefresh = $tw.perf.report("throttledMainRefresh",refresh),
|
||||
styleThrottledRefresh = $tw.perf.report("throttledStyleRefresh",styleRefresh);
|
||||
$tw.wiki.addEventListener("change",$tw.perf.report("styleRefresh",function(changes) {
|
||||
throttledRefreshFn(changes,{
|
||||
throttledRefresh: styleThrottledRefresh,
|
||||
callback: styleRefresh,
|
||||
mainCondition: false,
|
||||
styleCondition: true
|
||||
});
|
||||
}));
|
||||
// Display the $:/core/ui/PageTemplate tiddler to kick off the display
|
||||
$tw.perf.report("mainRender",function() {
|
||||
@ -72,44 +135,14 @@ exports.startup = function() {
|
||||
removeItem.parentNode.removeChild(removeItem);
|
||||
}
|
||||
});
|
||||
// Prepare refresh mechanism
|
||||
var deferredChanges = Object.create(null),
|
||||
timerId;
|
||||
function refresh() {
|
||||
// Process the refresh
|
||||
$tw.hooks.invokeHook("th-page-refreshing");
|
||||
$tw.pageWidgetNode.refresh(deferredChanges);
|
||||
deferredChanges = Object.create(null);
|
||||
$tw.hooks.invokeHook("th-page-refreshed");
|
||||
}
|
||||
var throttledRefresh = $tw.perf.report("throttledRefresh",refresh);
|
||||
|
||||
// Add the change event handler
|
||||
$tw.wiki.addEventListener("change",$tw.perf.report("mainRefresh",function(changes) {
|
||||
// Check if only tiddlers that are throttled have changed
|
||||
var onlyThrottledTiddlersHaveChanged = true;
|
||||
for(var title in changes) {
|
||||
var tiddler = $tw.wiki.getTiddler(title);
|
||||
if(!$tw.wiki.isVolatileTiddler(title) && (!tiddler || !(tiddler.hasField("draft.of") || tiddler.hasField("throttle.refresh")))) {
|
||||
onlyThrottledTiddlersHaveChanged = false;
|
||||
}
|
||||
}
|
||||
// Defer the change if only drafts have changed
|
||||
if(timerId) {
|
||||
clearTimeout(timerId);
|
||||
}
|
||||
timerId = null;
|
||||
if(onlyThrottledTiddlersHaveChanged) {
|
||||
var timeout = parseInt($tw.wiki.getTiddlerText(DRAFT_TIDDLER_TIMEOUT_TITLE,""),10);
|
||||
if(isNaN(timeout)) {
|
||||
timeout = THROTTLE_REFRESH_TIMEOUT;
|
||||
}
|
||||
timerId = setTimeout(throttledRefresh,timeout);
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
} else {
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
refresh();
|
||||
}
|
||||
throttledRefreshFn(changes,{
|
||||
throttledRefresh: mainThrottledRefresh,
|
||||
callback: refresh,
|
||||
mainCondition: true,
|
||||
styleCondition: false
|
||||
});
|
||||
}));
|
||||
// Fix up the link between the root widget and the page container
|
||||
$tw.rootWidget.domNodes = [$tw.pageContainer];
|
||||
|
||||
@ -24,7 +24,8 @@ exports.startup = function() {
|
||||
// Handle open window message
|
||||
$tw.rootWidget.addEventListener("tm-open-window",function(event) {
|
||||
// Get the parameters
|
||||
var refreshHandler,
|
||||
var mainRefreshHandler,
|
||||
styleRefreshHandler,
|
||||
title = event.param || event.tiddlerTitle,
|
||||
paramObject = event.paramObject || {},
|
||||
windowTitle = paramObject.windowTitle || title,
|
||||
@ -58,7 +59,8 @@ exports.startup = function() {
|
||||
srcDocument.title = windowTitle;
|
||||
srcWindow.addEventListener("beforeunload",function(event) {
|
||||
delete $tw.windows[windowID];
|
||||
$tw.wiki.removeEventListener("change",refreshHandler);
|
||||
$tw.wiki.removeEventListener("change",styleRefreshHandler);
|
||||
$tw.wiki.removeEventListener("change",mainRefreshHandler);
|
||||
},false);
|
||||
// Set up the styles
|
||||
var styleWidgetNode = $tw.wiki.makeTranscludeWidget("$:/core/ui/PageStylesheet",{
|
||||
@ -69,19 +71,91 @@ exports.startup = function() {
|
||||
styleWidgetNode.render(styleContainer,null);
|
||||
var styleElement = srcDocument.createElement("style");
|
||||
styleElement.innerHTML = styleContainer.textContent;
|
||||
styleWidgetNode.assignedStyles = styleContainer.textContent;
|
||||
srcDocument.head.insertBefore(styleElement,srcDocument.head.firstChild);
|
||||
// Render the text of the tiddler
|
||||
var parser = $tw.wiki.parseTiddler(template),
|
||||
widgetNode = $tw.wiki.makeWidget(parser,{document: srcDocument, parentWidget: $tw.rootWidget, variables: variables});
|
||||
widgetNode.render(srcDocument.body,srcDocument.body.firstChild);
|
||||
// Function to handle refreshes
|
||||
refreshHandler = function(changes) {
|
||||
if(styleWidgetNode.refresh(changes,styleContainer,null)) {
|
||||
styleElement.innerHTML = styleContainer.textContent;
|
||||
// Prepare refresh mechanism
|
||||
var mainDeferredChanges = Object.create(null),
|
||||
styleDeferredChanges = Object.create(null),
|
||||
mainTimerId,
|
||||
styleTimerId,
|
||||
throttledRefreshFn = function(changes,options) {
|
||||
options = options || {};
|
||||
// Check if only tiddlers that are throttled have changed
|
||||
var onlyThrottledTiddlersHaveChanged = true;
|
||||
var deferredChanges = options.mainCondition ? mainDeferredChanges : styleDeferredChanges;
|
||||
for(var title in changes) {
|
||||
var tiddler = $tw.wiki.getTiddler(title);
|
||||
if(!$tw.wiki.isVolatileTiddler(title) && (!tiddler || !(tiddler.hasField("draft.of") || tiddler.hasField("throttle.refresh") ||
|
||||
(options.mainCondition && tiddler.hasField("throttle.refresh.main")) || (options.styleCondition && tiddler.hasField("throttle.refresh.style"))))) {
|
||||
onlyThrottledTiddlersHaveChanged = false;
|
||||
}
|
||||
}
|
||||
// Defer the change if only drafts have changed
|
||||
if(options.mainCondition) {
|
||||
if(mainTimerId) {
|
||||
clearTimeout(mainTimerId);
|
||||
}
|
||||
mainTimerId = null;
|
||||
} else if(options.styleCondition) {
|
||||
if(styleTimerId) {
|
||||
clearTimeout(styleTimerId);
|
||||
}
|
||||
styleTimerId = null;
|
||||
}
|
||||
if(onlyThrottledTiddlersHaveChanged) {
|
||||
var timeout = parseInt($tw.wiki.getTiddlerText(DRAFT_TIDDLER_TIMEOUT_TITLE,""),10);
|
||||
if(isNaN(timeout)) {
|
||||
timeout = THROTTLE_REFRESH_TIMEOUT;
|
||||
}
|
||||
if(options.mainCondition) {
|
||||
mainTimerId = setTimeout(options.throttledRefresh,timeout);
|
||||
} else if(options.styleCondition) {
|
||||
styleTimerId = setTimeout(options.throttledRefresh,timeout);
|
||||
}
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
} else {
|
||||
$tw.utils.extend(deferredChanges,changes);
|
||||
options.callback();
|
||||
}
|
||||
};
|
||||
var styleRefresh = function() {
|
||||
if(styleWidgetNode.refresh(styleDeferredChanges,styleContainer,null)) {
|
||||
var newStyles = styleContainer.textContent;
|
||||
if(newStyles !== styleWidgetNode.assignedStyles) {
|
||||
styleWidgetNode.assignedStyles = newStyles;
|
||||
styleElement.innerHTML = styleWidgetNode.assignedStyles;
|
||||
}
|
||||
}
|
||||
widgetNode.refresh(changes);
|
||||
styleDeferredChanges = Object.create(null);
|
||||
};
|
||||
$tw.wiki.addEventListener("change",refreshHandler);
|
||||
var mainRefresh = function() {
|
||||
widgetNode.refresh(mainDeferredChanges);
|
||||
mainDeferredChanges = Object.create(null);
|
||||
};
|
||||
var mainThrottledRefresh = $tw.perf.report("throttledMainRefresh",mainRefresh),
|
||||
styleThrottledRefresh = $tw.perf.report("throttledStyleRefresh",styleRefresh);
|
||||
styleRefreshHandler = function(changes) {
|
||||
throttledRefreshFn(changes,{
|
||||
throttledRefresh: styleThrottledRefresh,
|
||||
callback: styleRefresh,
|
||||
mainCondition: false,
|
||||
styleCondition: true
|
||||
});
|
||||
};
|
||||
mainRefreshHandler = function(changes) {
|
||||
throttledRefreshFn(changes,{
|
||||
throttledRefresh: mainThrottledRefresh,
|
||||
callback: mainRefresh,
|
||||
mainCondition: true,
|
||||
styleCondition: false
|
||||
});
|
||||
};
|
||||
$tw.wiki.addEventListener("change",styleRefreshHandler);
|
||||
$tw.wiki.addEventListener("change",mainRefreshHandler);
|
||||
// Listen for keyboard shortcuts
|
||||
$tw.utils.addEventListeners(srcDocument,[{
|
||||
name: "keydown",
|
||||
|
||||
@ -12,6 +12,8 @@ The rules governing refresh throttling are:
|
||||
** Has the field `draft.of`
|
||||
** Has the field `throttle.refresh`
|
||||
** Has a title prefixed with `$:/temp/volatile/`
|
||||
** <<.from-version "5.3.6">> Has the field `throttle.refresh.main` - then throttling will only occur in the main refresh
|
||||
** <<.from-version "5.3.6">> Has the field `throttle.refresh.style` - then throttling will only occur in the style refresh
|
||||
* If the refresh cycle is to be throttled, a timer is set for the internal specified in [[$:/config/Drafts/TypingTimeout|Hidden Setting: Typing Refresh Delay]] (cancelling any previously set timer)
|
||||
** When the timer fires, the refresh cycle is triggered, passing the aggregated titles of all the deferred refresh cycles
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user