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

Fix problem with loading metafiles

Browse Source 
This issue was introduced in 1b41b44684.

Fixes problem raised by @pmario in
https://github.com/Jermolene/TiddlyWiki5/commit/3708f6c8e4f4bf2ea1cb10b0
fa685888485f788a#commitcomment-20848240
This commit is contained in:
Jermolene 2017-02-12 12:14:04 +00:00
parent 7b251df989
commit d5b04c2688
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/boot.js
View File

@ -1475,7 +1475,7 @@ $tw.loadTiddlersFromFile = function(filepath,fields) {
metadata; metadata;
if(ext !== ".json" && tiddlers.length === 1) { if(ext !== ".json" && tiddlers.length === 1) {
metadata = $tw.loadMetadataForFile(filepath); metadata = $tw.loadMetadataForFile(filepath);
tiddlers = [$tw.utils.extend({},metadata,tiddlers[0])]; tiddlers = [$tw.utils.extend({},tiddlers[0],metadata)];
} }
return {filepath: filepath, type: type, tiddlers: tiddlers, hasMetaFile: !!metadata}; return {filepath: filepath, type: type, tiddlers: tiddlers, hasMetaFile: !!metadata};
}; };