mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2025-08-06 22:04:19 +00:00
Code Issues Releases Wiki Activity

Sort out the naming and location of shadow template tiddlers

Browse Source
This commit is contained in:
Jeremy Ruston 2012-06-01 20:04:51 +01:00
parent 9bc3dce953
commit e0725bbb52
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -41,7 +41,7 @@ exports.eventMap = {};
// Navigate to a specified tiddler // Navigate to a specified tiddler
exports.eventMap["tw-navigate"] = function(event) { exports.eventMap["tw-navigate"] = function(event) {
var template = this.params.defaultViewTemplate || "ViewTemplate", var template = this.params.defaultViewTemplate || "$:/templates/ViewTemplate",
storyTiddler = this.wiki.getTiddler(this.params.story), storyTiddler = this.wiki.getTiddler(this.params.story),
story = {tiddlers: []}, story = {tiddlers: []},
navTiddler,t,tiddler; navTiddler,t,tiddler;
@ -75,7 +75,7 @@ exports.eventMap["tw-navigate"] = function(event) {
exports.eventMap["tw-EditTiddler"] = function(event) { exports.eventMap["tw-EditTiddler"] = function(event) {
var template, storyTiddler, story, storyRecord, tiddler, t; var template, storyTiddler, story, storyRecord, tiddler, t;
// Put the specified tiddler into edit mode // Put the specified tiddler into edit mode
template = this.params.defaultEditTemplate || "EditTemplate"; template = this.params.defaultEditTemplate || "$:/templates/EditTemplate";
storyTiddler = this.wiki.getTiddler(this.params.story); storyTiddler = this.wiki.getTiddler(this.params.story);
story = {tiddlers: []}; story = {tiddlers: []};
if(storyTiddler && $tw.utils.hop(storyTiddler.fields,"text")) { if(storyTiddler && $tw.utils.hop(storyTiddler.fields,"text")) {
@ -107,7 +107,7 @@ exports.eventMap["tw-EditTiddler"] = function(event) {
// Take a tiddler out of edit mode, saving the changes // Take a tiddler out of edit mode, saving the changes
exports.eventMap["tw-SaveTiddler"] = function(event) { exports.eventMap["tw-SaveTiddler"] = function(event) {
var template, storyTiddler, story, storyRecord, tiddler, storyTiddlerModified, t; var template, storyTiddler, story, storyRecord, tiddler, storyTiddlerModified, t;
template = this.params.defaultEditTemplate || "ViewTemplate"; template = this.params.defaultEditTemplate || "$:/templates/ViewTemplate";
storyTiddler = this.wiki.getTiddler(this.params.story); storyTiddler = this.wiki.getTiddler(this.params.story);
story = {tiddlers: []}; story = {tiddlers: []};
storyTiddlerModified = false; storyTiddlerModified = false;

5
core/modules/startup.js
View File

@ -52,8 +52,9 @@ exports.startup = function() {
// Host-specific startup // Host-specific startup
if($tw.browser) { if($tw.browser) {
// Display the PageTemplate // Display the PageTemplate
var renderer = $tw.wiki.parseTiddler("PageTemplate"); var template = "$:/templates/PageTemplate",
renderer.execute([],"PageTemplate"); renderer = $tw.wiki.parseTiddler(template);
renderer.execute([],template);
renderer.renderInDom(document.body); renderer.renderInDom(document.body);
$tw.wiki.addEventListener("",function(changes) { $tw.wiki.addEventListener("",function(changes) {
renderer.refreshInDom(changes); renderer.refreshInDom(changes);

2
core/templates/EditTemplate.tid
View File

@ -1,4 +1,4 @@
title: EditTemplate title: $:/templates/EditTemplate
modifier: JeremyRuston modifier: JeremyRuston
<<view title>> <<button SaveTiddler label:"done" class:"btn btn-mini btn-success">> <<view title>> <<button SaveTiddler label:"done" class:"btn btn-mini btn-success">>

4
core/templates/PageTemplate.tid
View File

@ -1,6 +1,6 @@
title: PageTemplate title: $:/templates/PageTemplate
{{navigation-panel{<<chooser>>}}}{{zoomer-panel{<<zoomer>>}}} {{navigation-panel{<<chooser>>}}}{{zoomer-panel{<<zoomer>>}}}
{{container-fluid{ {{container-fluid{
<<story story:StoryTiddlers storyview:scroller>> <<story story:"$:/StoryTiddlers" storyview:scroller>>
}}} }}}

2
core/templates/ViewTemplate.tid
View File

@ -1,4 +1,4 @@
title: ViewTemplate title: $:/templates/ViewTemplate
modifier: JeremyRuston modifier: JeremyRuston
{{title{ {{title{

8
tw5.com/shadows/StoryTiddlers.tid
View File

@ -1,10 +1,10 @@
title: StoryTiddlers title: $:/StoryTiddlers
type: application/json type: application/json
{ {
"tiddlers": [ "tiddlers": [
{"title": "HelloThere", "template": "ViewTemplate"}, {"title": "HelloThere", "template": "$:/templates/ViewTemplate"},
{"title": "Introduction", "template": "ViewTemplate"}, {"title": "Introduction", "template": "$:/templates/ViewTemplate"},
{"title": "NewWikiTextFeatures", "template": "ViewTemplate"} {"title": "NewWikiTextFeatures", "template": "$:/templates/ViewTemplate"}
] ]
} }