diff --git a/core/language/en-GB/ControlPanel.multids b/core/language/en-GB/ControlPanel.multids index cfa5e34f4..6b291ebf6 100644 --- a/core/language/en-GB/ControlPanel.multids +++ b/core/language/en-GB/ControlPanel.multids @@ -88,13 +88,13 @@ Settings/ToolbarButtons/Icons/Description: Include icon Settings/ToolbarButtons/Text/Description: Include text Settings/DefaultSidebarTab/Caption: Default Sidebar Tab Settings/DefaultSidebarTab/Hint: Specify which sidebar tab is displayed by default -Settings/LinkToBehaviour/Caption: Internal link opening behaviour -Settings/LinkToBehaviour/InsideRiver/Hint: Click occurred //within// the story river -Settings/LinkToBehaviour/OutsideRiver/Hint: Click occurred //outside// the story river +Settings/LinkToBehaviour/Caption: Tiddler Opening Behaviour +Settings/LinkToBehaviour/InsideRiver/Hint: Navigation from //within// the story river +Settings/LinkToBehaviour/OutsideRiver/Hint: Navigation from //outside// the story river Settings/LinkToBehaviour/OpenAbove: Open above the current tiddler Settings/LinkToBehaviour/OpenBelow: Open below the current tiddler -Settings/LinkToBehaviour/OpenAtTop: Open at the top of the river -Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the river +Settings/LinkToBehaviour/OpenAtTop: Open at the top of the story river +Settings/LinkToBehaviour/OpenAtBottom: Open at the bottom of the story river StoryView/Caption: Story View StoryView/Prompt: Current view: Theme/Caption: Theme diff --git a/core/modules/widgets/navigator.js b/core/modules/widgets/navigator.js index 865a12108..1a66990be 100755 --- a/core/modules/widgets/navigator.js +++ b/core/modules/widgets/navigator.js @@ -107,7 +107,7 @@ NavigatorWidget.prototype.replaceFirstTitleInStory = function(storyList,oldTitle storyList.splice(0,0,newTitle); } }; - + NavigatorWidget.prototype.addToStory = function(title,fromTitle) { var storyList = this.getStoryList(); // 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); if(fromIndex >= 0) { // 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 // Determine where to insert the tiddler; Fallback is "below" switch(openLinkFromInsideRiver) { @@ -142,11 +142,11 @@ NavigatorWidget.prototype.addToStory = function(title,fromTitle) { } } else { // 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" if(openLinkFromOutsideRiver === "bottom") { // Insert at bottom - slot = storyList.length; + slot = storyList.length; } else { // Insert at top slot = 0;