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

Require that wiki folders have a tiddlywiki.info file

Browse Source 
Previously, we were just using default content if the tiddlywiki.info
file was missing. This allowed us to do things like `tiddlywiki
—server` without actually being in a valid wiki folder.

Fixes #361
This commit is contained in:
Jermolene 2014-02-22 16:38:34 +00:00
parent 0737e62161
commit ecb845f1cd
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
boot/boot.js
View File

@ -1312,23 +1312,6 @@ $tw.loadPluginFolder = function(filepath,excludeRegExp) {
} }
}; };
/*
Fallback tiddlywiki.info content
*/
$tw.boot.defaultWikiInfo = {
"plugins": [
"tiddlywiki/tiddlyweb",
"tiddlywiki/filesystem"
],
"themes": [
"tiddlywiki/vanilla",
"tiddlywiki/snowwhite"
],
"languages": [
"en-GB"
]
};
/* /*
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
@ -1342,7 +1325,7 @@ $tw.loadWikiTiddlers = function(wikiPath,parentPaths) {
if(fs.existsSync(wikiInfoPath)) { if(fs.existsSync(wikiInfoPath)) {
wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8")); wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8"));
} else { } else {
wikiInfo = $tw.boot.defaultWikiInfo; return null;
} }
// Load any parent wikis // Load any parent wikis
if(wikiInfo.includeWikis) { if(wikiInfo.includeWikis) {
@ -1492,10 +1475,7 @@ $tw.boot.startup = function(options) {
// If the first command line argument doesn't start with `--` then we // If the first command line argument doesn't start with `--` then we
// interpret it as the path to the wiki folder, which will otherwise default // interpret it as the path to the wiki folder, which will otherwise default
// to the current folder // to the current folder
if($tw.boot.argv[0] === "*") { if($tw.boot.argv[0] && $tw.boot.argv[0].indexOf("--") !== 0) {
$tw.boot.wikiPath = undefined;
$tw.boot.argv = $tw.boot.argv.slice(1);
} else if($tw.boot.argv[0] && $tw.boot.argv[0].indexOf("--") !== 0) {
$tw.boot.wikiPath = $tw.boot.argv[0]; $tw.boot.wikiPath = $tw.boot.argv[0];
$tw.boot.argv = $tw.boot.argv.slice(1); $tw.boot.argv = $tw.boot.argv.slice(1);
} else { } else {