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

Added new wiki methods for reading and writing a toddler as data

Browse Source
This commit is contained in:
Jeremy Ruston 2012-07-22 22:03:06 +01:00
parent 1b007c52fc
commit a2caf46b1e
4 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/modules/macros/navigator.js
View File

@ -22,30 +22,22 @@ exports.info = {
}; };
exports.getStory = function() { exports.getStory = function() {
var storyTiddler = this.wiki.getTiddler(this.params.story); this.story = this.wiki.getTiddlerData(this.params.story,{tiddlers: []});
this.story = {tiddlers: []};
if(storyTiddler && $tw.utils.hop(storyTiddler.fields,"text")) {
this.story = JSON.parse(storyTiddler.fields.text);
}
}; };
exports.saveStory = function() { exports.saveStory = function() {
if(this.hasParameter("story")) { if(this.hasParameter("story")) {
this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getTiddler(this.params.story),{title: this.params.story, text: JSON.stringify(this.story)})); this.wiki.setTiddlerData(this.params.story,this.story);
} }
}; };
exports.getHistory = function() { exports.getHistory = function() {
var historyTiddler = this.wiki.getTiddler(this.params.history); this.history = this.wiki.getTiddlerData(this.params.history,{stack: []});
this.history = {stack: []};
if(historyTiddler && $tw.utils.hop(historyTiddler.fields,"text")) {
this.history = JSON.parse(historyTiddler.fields.text);
}
}; };
exports.saveHistory = function() { exports.saveHistory = function() {
if(this.hasParameter("history")) { if(this.hasParameter("history")) {
this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getTiddler(this.params.history),{title: this.params.history, text: JSON.stringify(this.history)})); this.wiki.setTiddlerData(this.params.history,this.history);
} }
}; };

14
core/modules/macros/story/story.js
View File

@ -52,21 +52,11 @@ exports.info = {
Get the data from the JSON story tiddler Get the data from the JSON story tiddler
*/ */
exports.getStory = function() { exports.getStory = function() {
var storyTiddler = this.wiki.getTiddler(this.params.story); this.story = this.wiki.getTiddlerData(this.params.story,{tiddlers: []});
this.story = {
tiddlers: []
};
if(storyTiddler && $tw.utils.hop(storyTiddler.fields,"text")) {
this.story = JSON.parse(storyTiddler.fields.text);
}
}; };
exports.getHistory = function() { exports.getHistory = function() {
var historyTiddler = this.wiki.getTiddler(this.params.history); this.history = this.wiki.getTiddlerData(this.params.history,{stack: []});
this.history = {stack: []};
if(historyTiddler && $tw.utils.hop(historyTiddler.fields,"text")) {
this.history = JSON.parse(historyTiddler.fields.text);
}
}; };
exports.getViewTemplate = function() { exports.getViewTemplate = function() {

4
core/modules/startup.js
View File

@ -75,8 +75,8 @@ exports.startup = function() {
story.tiddlers[t] = {title: defaultTiddlers[t]}; story.tiddlers[t] = {title: defaultTiddlers[t]};
history.stack[defaultTiddlers.length - t - 1] = {title: defaultTiddlers[t], fromTitle: defaultTiddlers[t+1]}; history.stack[defaultTiddlers.length - t - 1] = {title: defaultTiddlers[t], fromTitle: defaultTiddlers[t+1]};
} }
$tw.wiki.addTiddler(new $tw.Tiddler({title: storyTitle,text: JSON.stringify(story)})); $tw.wiki.addTiddler(new $tw.Tiddler({title: storyTitle,type: "application/json", text: JSON.stringify(story)}));
$tw.wiki.addTiddler(new $tw.Tiddler({title: historyTitle,text: JSON.stringify(history)})); $tw.wiki.addTiddler(new $tw.Tiddler({title: historyTitle,type: "application/json", text: JSON.stringify(history)}));
// If we're being viewed on a data: URI then give instructions for how to save // If we're being viewed on a data: URI then give instructions for how to save
if(document.location.protocol === "data:") { if(document.location.protocol === "data:") {
var event = document.createEvent("Event"); var event = document.createEvent("Event");

32
core/modules/wiki.js
View File

@ -317,6 +317,36 @@ exports.getTiddlersWithTag = function(tag) {
return titles; return titles;
}; };
/*
Get a tiddlers content as a JavaScript object. How this is done depends on the type of the tiddler:
application/json: the tiddler JSON is parsed into an object
Other types currently just return null.
*/
exports.getTiddlerData = function(title,defaultData) {
var tiddler = this.tiddlers[title],
data;
if(tiddler && tiddler.fields.text && tiddler.fields.type === "application/json") {
// JSON tiddler
try {
data = JSON.parse(tiddler.fields.text);
} catch(ex) {
return defaultData;
}
return data;
}
return defaultData;
};
/*
Set a tiddlers content to a JavaScript object. Currently this is done by setting the tiddler's type to "application/json" and setting the text to the JSON text of the data.
*/
exports.setTiddlerData = function(title,data) {
var tiddler = this.getTiddler(title);
this.addTiddler(new $tw.Tiddler(tiddler,{title: title, type: "application/json", text: JSON.stringify(data)}));
};
// Return the named cache object for a tiddler. If the cache doesn't exist then the initializer function is invoked to create it // Return the named cache object for a tiddler. If the cache doesn't exist then the initializer function is invoked to create it
exports.getCacheForTiddler = function(title,cacheName,initializer) { exports.getCacheForTiddler = function(title,cacheName,initializer) {
this.caches = this.caches || {}; this.caches = this.caches || {};
@ -398,7 +428,7 @@ Parse text in a specified format and render it into another format
outputType: content type for the output outputType: content type for the output
textType: content type of the input text textType: content type of the input text
text: input text text: input text
options: see below options: see wiki.parseText()
Options are: Options are:
defaultType: Default MIME type to use if the specified one is unknown defaultType: Default MIME type to use if the specified one is unknown
*/ */