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

Tweaks for #1662

Browse Source 
Coding style and ui copy
This commit is contained in:
Jermolene 2015-05-04 20:29:00 +01:00
parent 4656a7e8f6
commit a79e7a1c57
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/language/en-GB/ControlPanel.multids
View File

@ -88,13 +88,13 @@ Settings/ToolbarButtons/Icons/Description: Include icon
Settings/ToolbarButtons/Text/Description: Include text Settings/ToolbarButtons/Text/Description: Include text
Settings/DefaultSidebarTab/Caption: Default Sidebar Tab Settings/DefaultSidebarTab/Caption: Default Sidebar Tab
Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default
Settings/LinkToBehaviour/Caption: Internal link opening behaviour Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour
Settings/LinkToBehaviour/InsideRiver/Hint: Click occurred //within// the story river Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river
Settings/LinkToBehaviour/OutsideRiver/Hint: Click occurred //outside// the story river Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river
Settings/LinkToBehaviour/OpenAbove: Open above the current tiddler Settings/LinkToBehaviour/OpenAbove: Open above the current tiddler
Settings/LinkToBehaviour/OpenBelow: Open below the current tiddler Settings/LinkToBehaviour/OpenBelow: Open below the current tiddler
Settings/LinkToBehaviour/OpenAtTop: Open at the top of the river Settings/LinkToBehaviour/OpenAtTop: Open at the top of the story river
Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the river Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the story river
StoryView/Caption: Story View StoryView/Caption: Story View
StoryView/Prompt: Current view: StoryView/Prompt: Current view:
Theme/Caption: Theme Theme/Caption: Theme

8
core/modules/widgets/navigator.js
View File

@ -107,7 +107,7 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle
storyList.splice(0,0,newTitle); storyList.splice(0,0,newTitle);
} }
}; };
NavigatorWidget.prototype.addToStory = function(title,fromTitle) { NavigatorWidget.prototype.addToStory = function(title,fromTitle) {
var storyList = this.getStoryList(); var storyList = this.getStoryList();
// Quit if we cannot get hold of the story list // Quit if we cannot get hold of the story list
@ -124,7 +124,7 @@ NavigatorWidget.prototype.addToStory = function(title,fromTitle) {
var fromIndex = storyList.indexOf(fromTitle); var fromIndex = storyList.indexOf(fromTitle);
if(fromIndex >= 0) { if(fromIndex >= 0) {
// How to open internal links that were clicked from *within* the story river? // How to open internal links that were clicked from *within* the story river?
var openLinkFromInsideRiver = $tw.wiki.getTiddlerText("$:/config/Navigation/openLinkFromInsideRiver", "below"); var openLinkFromInsideRiver = $tw.wiki.getTiddlerText("$:/config/Navigation/openLinkFromInsideRiver","below");
// The tiddler is added from inside the river // The tiddler is added from inside the river
// Determine where to insert the tiddler; Fallback is "below" // Determine where to insert the tiddler; Fallback is "below"
switch(openLinkFromInsideRiver) { switch(openLinkFromInsideRiver) {
@ -142,11 +142,11 @@ NavigatorWidget.prototype.addToStory = function(title,fromTitle) {
} }
} else { } else {
// The tiddler is opened from outside the river. // The tiddler is opened from outside the river.
var openLinkFromOutsideRiver = $tw.wiki.getTiddlerText("$:/config/Navigation/openLinkFromOutsideRiver", "top"); var openLinkFromOutsideRiver = $tw.wiki.getTiddlerText("$:/config/Navigation/openLinkFromOutsideRiver","top");
// Determine where to insert the tiddler; Default is "top" // Determine where to insert the tiddler; Default is "top"
if(openLinkFromOutsideRiver === "bottom") { if(openLinkFromOutsideRiver === "bottom") {
// Insert at bottom // Insert at bottom
slot = storyList.length; slot = storyList.length;
} else { } else {
// Insert at top // Insert at top
slot = 0; slot = 0;