mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-11-23 18:17:20 +00:00
Code Issues Releases Wiki Activity

Updated to node v.0.8.2

Browse Source
This commit is contained in:
Jeremy Ruston 2012-07-13 17:08:15 +01:00
parent 3a24bdbaf3
commit d910d75124
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/boot.js
View File

@ -570,7 +570,7 @@ $tw.loadTiddlersFromFile = function(file,fields,isShadow) {
data = fs.readFileSync(file).toString(typeInfo ? typeInfo.encoding : "utf8"), data = fs.readFileSync(file).toString(typeInfo ? typeInfo.encoding : "utf8"),
tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields), tiddlers = $tw.wiki.deserializeTiddlers(ext,data,fields),
metafile = file + ".meta"; metafile = file + ".meta";
if(ext !== ".json" && tiddlers.length === 1 && path.existsSync(metafile)) { if(ext !== ".json" && tiddlers.length === 1 && fs.existsSync(metafile)) {
var metadata = fs.readFileSync(metafile).toString("utf8"); var metadata = fs.readFileSync(metafile).toString("utf8");
if(metadata) { if(metadata) {
tiddlers = [$tw.utils.parseFields(metadata,tiddlers[0])]; tiddlers = [$tw.utils.parseFields(metadata,tiddlers[0])];
@ -585,7 +585,7 @@ Load all the plugins from the plugins directory
$tw.loadTiddlersFromFolder = function(filepath,basetitle,excludeRegExp,isShadow) { $tw.loadTiddlersFromFolder = function(filepath,basetitle,excludeRegExp,isShadow) {
basetitle = basetitle || "$:/plugins"; basetitle = basetitle || "$:/plugins";
excludeRegExp = excludeRegExp || /^\.DS_Store$|.meta$/; excludeRegExp = excludeRegExp || /^\.DS_Store$|.meta$/;
if(path.existsSync(filepath)) { if(fs.existsSync(filepath)) {
var stat = fs.statSync(filepath); var stat = fs.statSync(filepath);
if(stat.isDirectory()) { if(stat.isDirectory()) {
var files = fs.readdirSync(filepath); var files = fs.readdirSync(filepath);

2
core/modules/recipe.js
View File

@ -40,7 +40,7 @@ exports["application/x-tiddlywiki-recipe"] = function(text,fields) {
fields = {title: sourcePath}, fields = {title: sourcePath},
tids = self.deserializeTiddlers(ext,data,fields), tids = self.deserializeTiddlers(ext,data,fields),
metafile = sourcePath + ".meta"; metafile = sourcePath + ".meta";
if(ext !== ".json" && tids.length === 1 && path.existsSync(metafile)) { if(ext !== ".json" && tids.length === 1 && fs.existsSync(metafile)) {
var metadata = fs.readFileSync(metafile).toString("utf8"); var metadata = fs.readFileSync(metafile).toString("utf8");
if(metadata) { if(metadata) {
tids = [$tw.utils.parseFields(metadata,tids[0])]; tids = [$tw.utils.parseFields(metadata,tids[0])];