mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-06-26 15:23:15 +00:00
Code Issues Releases Wiki Activity

More JSHint obeisance

Browse Source
This commit is contained in:
Jeremy Ruston 2012-11-15 12:46:42 +00:00
parent 1e51f56754
commit ce46866317
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/boot.js
View File

@ -870,12 +870,13 @@ $tw.loadTiddlers = function() {
$tw.wiki.addTiddlers($tw.loadTiddlersFromPath(folders[t])); $tw.wiki.addTiddlers($tw.loadTiddlersFromPath(folders[t]));
} }
// Load any plugins listed in the wiki info file // Load any plugins listed in the wiki info file
var wikiInfoPath = path.resolve($tw.boot.wikiPath,$tw.config.wikiInfo); var wikiInfoPath = path.resolve($tw.boot.wikiPath,$tw.config.wikiInfo),
bundle;
if(fs.existsSync(wikiInfoPath)) { if(fs.existsSync(wikiInfoPath)) {
var wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8")), var wikiInfo = JSON.parse(fs.readFileSync(wikiInfoPath,"utf8")),
pluginBasePath = path.resolve($tw.boot.bootPath,$tw.config.pluginsPath); pluginBasePath = path.resolve($tw.boot.bootPath,$tw.config.pluginsPath);
for(t=0; t<wikiInfo.plugins.length; t++) { for(t=0; t<wikiInfo.plugins.length; t++) {
var bundle = $tw.loadBundleFolder(path.resolve(pluginBasePath,"./" + wikiInfo.plugins[t])); bundle = $tw.loadBundleFolder(path.resolve(pluginBasePath,"./" + wikiInfo.plugins[t]));
if(bundle) { if(bundle) {
$tw.wiki.addTiddler(bundle); $tw.wiki.addTiddler(bundle);
} }
@ -886,7 +887,7 @@ $tw.loadTiddlers = function() {
if(fs.existsSync(wikiPluginsPath)) { if(fs.existsSync(wikiPluginsPath)) {
var pluginFolders = fs.readdirSync(wikiPluginsPath); var pluginFolders = fs.readdirSync(wikiPluginsPath);
for(t=0; t<pluginFolders.length; t++) { for(t=0; t<pluginFolders.length; t++) {
var bundle = $tw.loadBundleFolder(path.resolve(wikiPluginsPath,"./" + pluginFolders[t])); bundle = $tw.loadBundleFolder(path.resolve(wikiPluginsPath,"./" + pluginFolders[t]));
if(bundle) { if(bundle) {
$tw.wiki.addTiddler(bundle); $tw.wiki.addTiddler(bundle);
} }