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

Fallback to a default tiddlywiki.info file if it does not exist

Browse Source 
We fallback to settings suitable for the server version, to help people
get up and running quickly.
This commit is contained in:
Jermolene 2013-12-18 21:11:00 +00:00
parent 218b9c967e
commit 0ec2224757
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
boot/boot.js
View File

@ -1159,7 +1159,6 @@ metadata files.
*/ */
$tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/; $tw.boot.excludeRegExp = /^\.DS_Store$|^.*\.meta$|^\..*\.swp$|^\._.*$|^\.git$|^\.hg$|^\.lock-wscript$|^\.svn$|^\.wafpickle-.*$|^CVS$|^npm-debug\.log$/;
/* /*
Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property. Load all the tiddlers recursively from a directory, including honouring `tiddlywiki.files` files for drawing in external files. Returns an array of {filepath:,type:,tiddlers: [{..fields...}],hasMetaFile:}. Note that no file information is returned for externally loaded tiddlers, just the `tiddlers` property.
*/ */
@ -1255,6 +1254,20 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
} }
}; };
/*
Fallback tiddlywiki.info content
*/
$tw.boot.defaultWikiInfo = {
"plugins": [
"tiddlywiki/tiddlyweb",
"tiddlywiki/filesystem"
],
"themes": [
"tiddlywiki/vanilla",
"tiddlywiki/snowwhite"
]
};
/* /*
path: path of wiki directory path: path of wiki directory
parentPaths: array of parent paths that we mustn't recurse into parentPaths: array of parent paths that we mustn't recurse into
@ -1262,13 +1275,14 @@ parentPaths: array of parent paths that we mustn't recurse into
$tw.loadWikiTiddlers = function(wikiPath,parentPaths) { $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
parentPaths = parentPaths || []; parentPaths = parentPaths || [];
var wikiInfoPath = path.resolve(wikiPath,$tw.config.wikiInfo), var wikiInfoPath = path.resolve(wikiPath,$tw.config.wikiInfo),
wikiInfo = {}, wikiInfo,
pluginFields; pluginFields;
// Bail if we don't have a wiki info file // Bail if we don't have a wiki info file
if(!fs.existsSync(wikiInfoPath)) { if(fs.existsSync(wikiInfoPath)) {
$tw.utils.error("Missing tiddlywiki.info file at " + wikiPath); wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
} else {
wikiInfo = $tw.boot.defaultWikiInfo;
} }
wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
// Load any parent wikis // Load any parent wikis
if(wikiInfo.includeWikis) { if(wikiInfo.includeWikis) {
parentPaths = parentPaths.slice(0); parentPaths = parentPaths.slice(0);