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

Refactored TiddlerInput.js to take advantage of recent refactoring of Tiddler.js

Browse Source
This commit is contained in:
Jeremy Ruston
2011-11-30 18:53:43 +00:00
parent 02137055ec
commit 6202e64eaa
1 changed files with 6 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
js/TiddlerInput.js
View File

@@ -76,14 +76,10 @@ tiddlerInput.parseTiddlerFileByMimeType = {
for(var t=0; t<tiddlers.length; t++) { for(var t=0; t<tiddlers.length; t++) {
var tid = tiddlers[t], var tid = tiddlers[t],
fields = {}; fields = {};
fields.title = tid.title; // Just whitelist the fields we know that we want
fields.text = tid.text; "title text created creator modified modifier type tags".split(" ").forEach(function(value) {
fields.created = utils.convertFromYYYYMMDDHHMMSS(tid.created); fields[value] = tid[value];
fields.creator = tid.creator; });
fields.modified = utils.convertFromYYYYMMDDHHMMSS(tid.modified);
fields.modifier = tid.modifier;
fields.type = tid.type;
fields.tags = tid.tags;
result.push(fields); result.push(fields);
} }
return result; return result;
@@ -111,7 +107,7 @@ tiddlerInput.parseMetaDataBlock = function(metaData,fields) {
if(p !== -1) { if(p !== -1) {
var field = line.substr(0, p).trim(); var field = line.substr(0, p).trim();
var value = line.substr(p+1).trim(); var value = line.substr(p+1).trim();
fields[field] = tiddlerInput.parseMetaDataItem(field,value); fields[field] = value;
} }
}); });
return fields; return fields;
@@ -148,30 +144,9 @@ tiddlerInput.parseTiddlerDiv = function(text,fields) {
if(attrMatch) { if(attrMatch) {
var name = attrMatch[1]; var name = attrMatch[1];
var value = attrMatch[2]; var value = attrMatch[2];
fields[name] = tiddlerInput.parseMetaDataItem(name,value); fields[name] = value;
} }
} while(attrMatch); } while(attrMatch);
} }
return fields; return fields;
} }
/*
Parse a single metadata field/value pair and return the value as the appropriate data type
*/
tiddlerInput.parseMetaDataItem = function(field,value) {
var result;
switch(field) {
case "modified":
case "created":
result = utils.convertFromYYYYMMDDHHMMSS(value);
break;
case "tags":
var parser = new ArgParser(value,{noNames: true});
result = parser.getValuesByName("","");
break;
default:
result = value;
break;
}
return result;
}