mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-01-11 18:00:26 +00:00
Code Issues Releases Wiki Activity

Refactoring some internal identifiers

Browse Source
This commit is contained in:
Jeremy Ruston 2012-05-19 19:06:42 +01:00
parent 34edb48784
commit 5b3bdcc662
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/boot.js
View File

@ -544,7 +544,7 @@ $tw.boot.wikiPath = process.cwd();
/* /*
Load the tiddlers contained in a particular file (and optionally the accompanying .meta file) Load the tiddlers contained in a particular file (and optionally the accompanying .meta file)
*/ */
$tw.plugins.loadTiddlersFromFile = function(file,fields,wiki) { $tw.loadTiddlersFromFile = function(file,fields,wiki) {
wiki = wiki || $tw.wiki; wiki = wiki || $tw.wiki;
var ext = path.extname(file), var ext = path.extname(file),
extensionInfo = $tw.config.fileExtensions[ext], extensionInfo = $tw.config.fileExtensions[ext],
@ -563,7 +563,7 @@ $tw.plugins.loadTiddlersFromFile = function(file,fields,wiki) {
/* /*
Load all the plugins from the plugins directory Load all the plugins from the plugins directory
*/ */
$tw.plugins.loadPluginsFromFolder = function(filepath,basetitle,excludeRegExp,wiki) { $tw.loadTiddlersFromFolder = function(filepath,basetitle,excludeRegExp,wiki) {
basetitle = basetitle || "$:/plugins"; basetitle = basetitle || "$:/plugins";
excludeRegExp = excludeRegExp || /^\.DS_Store$|.meta$/; excludeRegExp = excludeRegExp || /^\.DS_Store$|.meta$/;
wiki = wiki || $tw.wiki.shadows; wiki = wiki || $tw.wiki.shadows;
@ -576,19 +576,19 @@ $tw.plugins.loadPluginsFromFolder = function(filepath,basetitle,excludeRegExp,wi
// If so, process the files it describes // If so, process the files it describes
var pluginInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.plugin").toString("utf8")); var pluginInfo = JSON.parse(fs.readFileSync(filepath + "/tiddlywiki.plugin").toString("utf8"));
for(var p=0; p<pluginInfo.tiddlers.length; p++) { for(var p=0; p<pluginInfo.tiddlers.length; p++) {
$tw.plugins.loadTiddlersFromFile(path.resolve(filepath,pluginInfo.tiddlers[p].file),pluginInfo.tiddlers[p].fields,wiki); $tw.loadTiddlersFromFile(path.resolve(filepath,pluginInfo.tiddlers[p].file),pluginInfo.tiddlers[p].fields,wiki);
} }
} else { } else {
// If not, read all the files in the directory // If not, read all the files in the directory
for(var f=0; f<files.length; f++) { for(var f=0; f<files.length; f++) {
var file = files[f]; var file = files[f];
if(!excludeRegExp.test(file)) { if(!excludeRegExp.test(file)) {
$tw.plugins.loadPluginsFromFolder(filepath + "/" + file,basetitle + "/" + file,excludeRegExp,wiki); $tw.loadTiddlersFromFolder(filepath + "/" + file,basetitle + "/" + file,excludeRegExp,wiki);
} }
} }
} }
} else if(stat.isFile()) { } else if(stat.isFile()) {
$tw.plugins.loadTiddlersFromFile(filepath,{title: basetitle},wiki); $tw.loadTiddlersFromFile(filepath,{title: basetitle},wiki);
} }
} }
}; };
@ -629,16 +629,16 @@ $tw.modules.execute = function(moduleName,moduleRoot) {
}; };
// Load plugins from the plugins directory // Load plugins from the plugins directory
$tw.plugins.loadPluginsFromFolder(path.resolve($tw.boot.bootPath,$tw.config.bootModuleSubDir)); $tw.loadTiddlersFromFolder(path.resolve($tw.boot.bootPath,$tw.config.bootModuleSubDir));
// Load any plugins in the wiki plugins directory // Load any plugins in the wiki plugins directory
$tw.plugins.loadPluginsFromFolder(path.resolve($tw.boot.wikiPath,$tw.config.wikiPluginsSubDir)); $tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,$tw.config.wikiPluginsSubDir));
// HACK: to be replaced when we re-establish sync plugins // HACK: to be replaced when we re-establish sync plugins
// Load shadow tiddlers from wiki shadows directory // Load shadow tiddlers from wiki shadows directory
$tw.plugins.loadPluginsFromFolder(path.resolve($tw.boot.wikiPath,"./shadows")); $tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,"./shadows"));
// Load tiddlers from wiki tiddlers directory // Load tiddlers from wiki tiddlers directory
$tw.plugins.loadPluginsFromFolder(path.resolve($tw.boot.wikiPath,"./tiddlers"),null,null,$tw.wiki); $tw.loadTiddlersFromFolder(path.resolve($tw.boot.wikiPath,"./tiddlers"),null,null,$tw.wiki);
// End of if(!$tw.browser) // End of if(!$tw.browser)
} }

2
core/modules/startup.js
View File

@ -40,7 +40,7 @@ exports.startup = function() {
$tw.version = $tw.utils.extractVersionInfo(); $tw.version = $tw.utils.extractVersionInfo();
// Load up the tiddlers in the root of the core directory (we couldn't do before because we didn't have the serializers installed) // Load up the tiddlers in the root of the core directory (we couldn't do before because we didn't have the serializers installed)
if(!$tw.browser) { if(!$tw.browser) {
$tw.plugins.loadPluginsFromFolder($tw.boot.bootPath,"$:/core",/^\.DS_Store$|.meta$|^modules$/); $tw.loadTiddlersFromFolder($tw.boot.bootPath,"$:/core",/^\.DS_Store$|.meta$|^modules$/);
} }
// Set up the wiki store // Set up the wiki store
$tw.wiki.initMacros(); $tw.wiki.initMacros();