From 9ed82c09fda837b83dcc397880671c2629e718ff Mon Sep 17 00:00:00 2001 From: Jeremy Ruston Date: Sun, 20 May 2012 15:19:38 +0100 Subject: [PATCH] Introduce identifiers for tiddler subdirectories --- core/boot.js | 6 ++++-- core/{ => templates}/static.template.html.tid | 0 core/{ => templates}/tiddlywiki5.template.html.tid | 0 3 files changed, 4 insertions(+), 2 deletions(-) rename core/{ => templates}/static.template.html.tid (100%) rename core/{ => templates}/tiddlywiki5.template.html.tid (100%) diff --git a/core/boot.js b/core/boot.js index c6b7a578b..83b636861 100644 --- a/core/boot.js +++ b/core/boot.js @@ -53,6 +53,8 @@ $tw.config = $tw.config || {}; $tw.config.root = $tw.config.root || "$:"; // Root for module titles (eg, "$:/kernel/boot.js") $tw.config.bootModuleSubDir = $tw.config.bootModuleSubDir || "./modules"; $tw.config.wikiPluginsSubDir = $tw.config.wikiPluginsSubDir || "./plugins"; +$tw.config.wikiShadowsSubDir = $tw.config.wikiShadowsSubDir || "./shadows"; +$tw.config.wikiTiddlersSubDir = $tw.config.wikiTiddlersSubDir || "./tiddlers"; // File extensions $tw.config.fileExtensions = { @@ -636,9 +638,9 @@ $tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,$tw.config.wikiPlugins // HACK: to be replaced when we re-establish sync plugins // Load shadow tiddlers from wiki shadows directory -$tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,"./shadows")); +$tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,$tw.config.wikiShadowsSubDir)); // Load tiddlers from wiki tiddlers directory -$tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,"./tiddlers"),null,null,$tw.wiki); +$tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,$tw.config.wikiTiddlersSubDir),null,null,$tw.wiki); // End of if(!$tw.browser) } diff --git a/core/static.template.html.tid b/core/templates/static.template.html.tid similarity index 100% rename from core/static.template.html.tid rename to core/templates/static.template.html.tid diff --git a/core/tiddlywiki5.template.html.tid b/core/templates/tiddlywiki5.template.html.tid similarity index 100% rename from core/tiddlywiki5.template.html.tid rename to core/templates/tiddlywiki5.template.html.tid