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

Reverted to classic semantics of new tiddlers opening below the one being navigated from

Browse Source
This commit is contained in:
Jeremy Ruston
2012-06-22 12:25:01 +01:00
parent be6bff402d
commit 14e433a11d
1 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -49,13 +49,31 @@ exports.handleEvent = function(event) {
} }
}; };
/*
Return the index of the story element that contains the specified tree node. Returns story.length if not found
*/
exports.findStoryElementContainingNode = function(node) {
// Get the DOM node contained by the target node
while(node && !node.domNode) {
node = node.child;
}
// Step through the story elements
var slot = this.storyNode.children.length;
for(var t=0; t<this.storyNode.children.length; t++) {
if($tw.utils.domContains(this.storyNode.children[t].domNode,node.domNode)) {
slot = t;
}
}
return slot;
};
exports.eventMap = {}; 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 || "$:/templates/ViewTemplate", var template = this.params.defaultViewTemplate || "$:/templates/ViewTemplate",
story = this.getStory(), story = this.getStory(),
navTiddler,t,tiddler; navTiddler,t,tiddler,slot;
// See if the tiddler we want is already there // See if the tiddler we want is already there
for(t=0; t<story.tiddlers.length; t++) { for(t=0; t<story.tiddlers.length; t++) {
if(story.tiddlers[t].title === event.navigateTo) { if(story.tiddlers[t].title === event.navigateTo) {
@@ -68,8 +86,14 @@ exports.eventMap["tw-navigate"] = function(event) {
this.storyview.navigate(this.storyNode.children[navTiddler],false,event); this.storyview.navigate(this.storyNode.children[navTiddler],false,event);
} }
} else { } else {
// Find the source location in the story
if(event.navigateFrom) {
slot = this.findStoryElementContainingNode(event.navigateFrom) + 1;
} else {
slot = 0;
}
// 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)
story.tiddlers.unshift({title: event.navigateTo, template: template}); story.tiddlers.splice(slot,0,{title: event.navigateTo, template: template});
this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getTiddler(this.params.story),{text: JSON.stringify(story)})); this.wiki.addTiddler(new $tw.Tiddler(this.wiki.getTiddler(this.params.story),{text: JSON.stringify(story)}));
// Record the details of the navigation for us to pick up in refreshInDom() // Record the details of the navigation for us to pick up in refreshInDom()
this.lastNavigationEvent = event; this.lastNavigationEvent = event;
@@ -153,7 +177,7 @@ exports.eventMap["tw-CloseTiddler"] = function(event) {
storyElement = this.storyNode.children[t]; storyElement = this.storyNode.children[t];
// Invoke the storyview to animate the closure // Invoke the storyview to animate the closure
if(this.storyview && this.storyview.close) { if(this.storyview && this.storyview.close) {
if(!this.storyview.close(storyElement,this.lastNavigationEvent)) { if(!this.storyview.close(storyElement,event)) {
// Only delete the DOM element if the storyview.close() returned false // Only delete the DOM element if the storyview.close() returned false
storyElement.domNode.parentNode.removeChild(storyElement.domNode); storyElement.domNode.parentNode.removeChild(storyElement.domNode);
} }