mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-24 17:10:29 +00:00
Code Issues Releases Wiki Activity

Updated story macro to allow for contained content

Browse Source 
This allows us to fix the zooming chooser and zooming navigator
This commit is contained in:
Jeremy Ruston 2012-06-07 13:10:15 +01:00
parent 22b27f4251
commit e2707ae49d
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,7 @@ exports.eventMap["tw-navigate"] = function(event) {
if(typeof(navTiddler) !== "undefined") { if(typeof(navTiddler) !== "undefined") {
// If we found our tiddler, just tell the storyview to navigate to it // If we found our tiddler, just tell the storyview to navigate to it
if(this.storyview && this.storyview.navigate) { if(this.storyview && this.storyview.navigate) {
this.storyview.navigate(this.children[0].children[navTiddler],false,event); this.storyview.navigate(this.storyNode.children[navTiddler],false,event);
} }
} else { } else {
// Add the tiddler to the bottom of the story (subsequently there will be a refreshInDom() call which is when we'll actually do the navigation) // Add the tiddler to the bottom of the story (subsequently there will be a refreshInDom() call which is when we'll actually do the navigation)
@ -144,17 +144,21 @@ exports.eventMap["tw-SaveTiddler"] = function(event) {
}; };
exports.executeMacro = function() { exports.executeMacro = function() {
var story = this.getStory(), // Create the story frame
storyNode = $tw.Tree.Element("div",{"class": "tw-story-frame"},[]); var story = this.getStory();
this.contentNode = $tw.Tree.Element("div",{"class": "tw-story-content"},this.content);
this.contentNode.execute(this.parents,this.tiddlerTitle);
this.storyNode = $tw.Tree.Element("div",{"class": "tw-story-frame"},[]);
// Create each story element
for(var t=0; t<story.tiddlers.length; t++) { for(var t=0; t<story.tiddlers.length; t++) {
var m = $tw.Tree.Macro("tiddler",{ var m = $tw.Tree.Macro("tiddler",{
srcParams: {target: story.tiddlers[t].title,template: story.tiddlers[t].template}, srcParams: {target: story.tiddlers[t].title,template: story.tiddlers[t].template},
wiki: this.wiki wiki: this.wiki
}); });
m.execute(this.parents,this.tiddlerTitle); m.execute(this.parents,this.tiddlerTitle);
storyNode.children.push($tw.Tree.Element("div",{"class": "tw-story-element"},[m])); this.storyNode.children.push($tw.Tree.Element("div",{"class": "tw-story-element"},[m]));
} }
return [storyNode]; return [this.contentNode,this.storyNode];
}; };
exports.postRenderInDom = function() { exports.postRenderInDom = function() {
@ -181,8 +185,8 @@ exports.refreshInDom = function(changes) {
template = this.params.template, template = this.params.template,
n,domNode, n,domNode,
findTiddler = function (childIndex,tiddlerTitle,templateTitle) { findTiddler = function (childIndex,tiddlerTitle,templateTitle) {
while(childIndex < self.children[0].children.length) { while(childIndex < self.storyNode.children.length) {
var params = self.children[0].children[childIndex].children[0].params; var params = self.storyNode.children[childIndex].children[0].params;
if(params.target === tiddlerTitle) { if(params.target === tiddlerTitle) {
if(!templateTitle || params.template === templateTitle) { if(!templateTitle || params.template === templateTitle) {
return childIndex; return childIndex;
@ -204,34 +208,34 @@ exports.refreshInDom = function(changes) {
}) })
]); ]);
m.execute(this.parents,this.tiddlerTitle); m.execute(this.parents,this.tiddlerTitle);
m.renderInDom(this.children[0].domNode,this.children[0].domNode.childNodes[t]); m.renderInDom(this.storyNode.domNode,this.storyNode.domNode.childNodes[t]);
this.children[0].children.splice(t,0,m); this.storyNode.children.splice(t,0,m);
// Invoke the storyview to animate the navigation // Invoke the storyview to animate the navigation
if(this.storyview && this.storyview.navigate) { if(this.storyview && this.storyview.navigate) {
this.storyview.navigate(this.children[0].children[t],true,this.lastNavigationEvent); this.storyview.navigate(this.storyNode.children[t],true,this.lastNavigationEvent);
} }
} else { } else {
// Delete any nodes preceding the one we want // Delete any nodes preceding the one we want
if(tiddlerNode > t) { if(tiddlerNode > t) {
// First delete the DOM nodes // First delete the DOM nodes
for(n=t; n<tiddlerNode; n++) { for(n=t; n<tiddlerNode; n++) {
domNode = this.children[0].children[n].domNode; domNode = this.storyNode.children[n].domNode;
domNode.parentNode.removeChild(domNode); domNode.parentNode.removeChild(domNode);
} }
// Then delete the actual renderer nodes // Then delete the actual renderer nodes
this.children[0].children.splice(t,tiddlerNode-t); this.storyNode.children.splice(t,tiddlerNode-t);
} }
// Refresh the DOM node we're reusing // Refresh the DOM node we're reusing
this.children[0].children[t].refreshInDom(changes); this.storyNode.children[t].refreshInDom(changes);
} }
} }
// Remove any left over nodes // Remove any left over nodes
if(this.children[0].children.length > story.tiddlers.length) { if(this.storyNode.children.length > story.tiddlers.length) {
for(t=story.tiddlers.length; t<this.children[0].children.length; t++) { for(t=story.tiddlers.length; t<this.storyNode.children.length; t++) {
domNode = this.children[0].children[t].domNode; domNode = this.storyNode.children[t].domNode;
domNode.parentNode.removeChild(domNode); domNode.parentNode.removeChild(domNode);
} }
this.children[0].children.splice(story.tiddlers.length,this.children[0].children.length-story.tiddlers.length); this.storyNode.children.splice(story.tiddlers.length,this.storyNode.children.length-story.tiddlers.length);
} }
} else { } else {
// If our dependencies didn't change, just refresh the children // If our dependencies didn't change, just refresh the children

5
core/templates/PageTemplate.tid
View File

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