mirrors/TiddlyWiki5
1
0
Fork 0
mirror of https://github.com/Jermolene/TiddlyWiki5 synced 2024-12-25 09:30:28 +00:00
Code Issues Releases Wiki Activity

Fixes for new tiddler positioning

Browse Source
This commit is contained in:
Jeremy Ruston 2012-10-24 23:03:06 +01:00
parent 8d67bcb718
commit ccf93118ba
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -117,7 +117,7 @@ exports.createListElement = function(title) {
}}; }};
node.execute(this.parents,this.tiddlerTitle); node.execute(this.parents,this.tiddlerTitle);
var listElement = $tw.Tree.Element(this.isBlock ? "div" : "span",{"class": ["tw-list-element"]},[node],{ var listElement = $tw.Tree.Element(this.isBlock ? "div" : "span",{"class": ["tw-list-element"]},[node],{
events: ["tw-navigate","tw-EditTiddler","tw-SaveTiddler","tw-CloseTiddler"], events: ["tw-navigate","tw-EditTiddler","tw-SaveTiddler","tw-CloseTiddler","tw-NewTiddler"],
eventHandler: eventHandler eventHandler: eventHandler
}); });
// Save our data inside the list element node // Save our data inside the list element node

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

@ -32,6 +32,15 @@ exports.saveList = function(title,list) {
},storyTiddler,{text: list.join("\n")})); },storyTiddler,{text: list.join("\n")}));
}; };
exports.findTitleInStory = function(title,defaultIndex) {
for(var t=0; t<this.story.length; t++) {
if(this.story[t] === title) {
return t;
}
}
return defaultIndex;
};
exports.handleEvent = function(event) { exports.handleEvent = function(event) {
if(this.eventMap[event.type]) { if(this.eventMap[event.type]) {
this.eventMap[event.type].call(this,event); this.eventMap[event.type].call(this,event);
@ -54,14 +63,7 @@ exports.eventMap["tw-navigate"] = function(event) {
// 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
slot = 0; slot = this.findTitleInStory(event.navigateFromTitle,-1) + 1;
if(event.navigateFromTitle !== undefined) {
for(t=0; t<this.story.length; t++) {
if(this.story[t] === event.navigateFromTitle) {
slot = t + 1;
}
}
}
// Add the tiddler // Add the tiddler
this.story.splice(slot,0,event.navigateTo); this.story.splice(slot,0,event.navigateTo);
// Save the story // Save the story
@ -179,8 +181,9 @@ exports.eventMap["tw-NewTiddler"] = function(event) {
"draft.of": title "draft.of": title
}); });
this.wiki.addTiddler(draftTiddler); this.wiki.addTiddler(draftTiddler);
// Update the story to put the new draft at the top // Update the story to insert the new draft at the top
this.story.splice(0,0,draftTitle); var slot = this.findTitleInStory(event.navigateFromTitle,-1) + 1;
this.story.splice(slot,0,draftTitle);
// Save the updated story // Save the updated story
this.saveList(this.storyTitle,this.story); this.saveList(this.storyTitle,this.story);
// Add a new record to the top of the history stack // Add a new record to the top of the history stack