mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-07-08 13:04:21 +00:00
Code Issues Releases Wiki Activity

Fixes for navigation

Browse Source
This commit is contained in:
Jeremy Ruston 2012-10-24 22:50:15 +01:00
parent e88da55683
commit 8d67bcb718
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/modules/macros/list/list.js
View File

@ -112,7 +112,6 @@ exports.createListElement = function(title) {
var node = this.createListElementMacro(title), var node = this.createListElementMacro(title),
eventHandler = {handleEvent: function(event) { eventHandler = {handleEvent: function(event) {
// Add context information to the event // Add context information to the event
event.navigateFromListElement = node;
event.navigateFromTitle = title; event.navigateFromTitle = title;
return true; return true;
}}; }};

10
core/modules/macros/navigationcatcher.js
View File

@ -47,21 +47,17 @@ exports.eventMap["tw-navigate"] = function(event) {
var t,tiddler,slot; var t,tiddler,slot;
// See if the tiddler is already there // See if the tiddler is already there
for(t=0; t<this.story.length; t++) { for(t=0; t<this.story.length; t++) {
if(this.story[t].title === event.navigateTo) { if(this.story[t] === event.navigateTo) {
tiddler = t; tiddler = t;
} }
} }
// If not we need to add it // If not we need to add it
if(tiddler === undefined) { if(tiddler === undefined) {
// First we try to find the position of the story element we navigated from // First we try to find the position of the story element we navigated from
var navigateFromTitle;
if(event.navigateFromStoryElement) {
navigateFromTitle = event.navigateFromStoryElement.params.target;
}
slot = 0; slot = 0;
if(navigateFromTitle !== undefined) { if(event.navigateFromTitle !== undefined) {
for(t=0; t<this.story.length; t++) { for(t=0; t<this.story.length; t++) {
if(this.story[t].title === navigateFromTitle) { if(this.story[t] === event.navigateFromTitle) {
slot = t + 1; slot = t + 1;
} }
} }