From 6d397edf3005d14ae397e2d683b8b85cb6d554d9 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Thu, 25 Oct 2012 12:55:36 +0100
Subject: [PATCH] Rename the navigationcatcher macro to navigator

---
 core/modules/macros/navigationcatcher.js  | 4 ++--
 core/templates/PageTemplate.tid           | 4 ++--
 tw5dropbox/appwiki/wiki/PageTemplate.tid  | 4 ++--
 tw5dropbox/mainwiki/wiki/PageTemplate.tid | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/core/modules/macros/navigationcatcher.js b/core/modules/macros/navigationcatcher.js
index 09d447207..410b96957 100644
--- a/core/modules/macros/navigationcatcher.js
+++ b/core/modules/macros/navigationcatcher.js
@@ -1,5 +1,5 @@
 /*\
-title: $:/core/modules/macros/navigationcatcher.js
+title: $:/core/modules/macros/navigator.js
 type: application/javascript
 module-type: macro
 
@@ -13,7 +13,7 @@ Traps navigation events to update a story tiddler and history tiddler. Can also
 "use strict";
 
 exports.info = {
-	name: "navigationcatcher",
+	name: "navigator",
 	params: {
 		story: {byName: "default", type: "text"}, // Actually a tiddler, but we don't want it to be a dependency
 		history: {byName: "default", type: "text"}, // Actually a tiddler, but we don't want it to be a dependency
diff --git a/core/templates/PageTemplate.tid b/core/templates/PageTemplate.tid
index 4a3196889..1fb2a96cb 100644
--- a/core/templates/PageTemplate.tid
+++ b/core/templates/PageTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/PageTemplate
 
 <!-- The navigator catches navigation events and updates the story and history tiddlers -->
-<<navigationcatcher ><
+<<navigator ><
 
 <!--  Zooming chooser -->
 {{navigation-panel{
@@ -76,7 +76,7 @@ title: $:/templates/PageTemplate
 }}}
 
 <!-- This navigator intercepts navigation events and sets the text of the specified tiddler to the target tiddler title -->
-<<navigationcatcher set:[[$:/CurrentView]]><
+<<navigator set:[[$:/CurrentView]]><
 <<reveal state:ViewDropDownState type:popup position:below><
 <div class="open">
 {{dropdown-menu tw-suppress-missing-tiddlylink{
diff --git a/tw5dropbox/appwiki/wiki/PageTemplate.tid b/tw5dropbox/appwiki/wiki/PageTemplate.tid
index b2fc6f8d0..9104758ae 100644
--- a/tw5dropbox/appwiki/wiki/PageTemplate.tid
+++ b/tw5dropbox/appwiki/wiki/PageTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/PageTemplate
 
 <!-- The navigator catches navigation events and updates the story and history tiddlers -->
-<<navigationcatcher story:"$:/StoryTiddlers" history:"$:/History" ><
+<<navigator story:"$:/StoryTiddlers" history:"$:/History" ><
 
 <!--  Zooming chooser -->
 {{navigation-panel{
@@ -51,7 +51,7 @@ title: $:/templates/PageTemplate
 }}}
 
 <!-- This navigator intercepts navigation events and sets the text of the specified tiddler to the target tiddler title -->
-<<navigationcatcher set:[[$:/CurrentView]]><
+<<navigator set:[[$:/CurrentView]]><
 <<reveal state:ViewDropDownState type:popup position:below><
 <div class="open">
 {{dropdown-menu tw-suppress-missing-tiddlylink{
diff --git a/tw5dropbox/mainwiki/wiki/PageTemplate.tid b/tw5dropbox/mainwiki/wiki/PageTemplate.tid
index 709c10261..c146c939c 100644
--- a/tw5dropbox/mainwiki/wiki/PageTemplate.tid
+++ b/tw5dropbox/mainwiki/wiki/PageTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/PageTemplate
 
 <!-- The navigator catches navigation events and updates the story and history tiddlers -->
-<<navigationcatcher story:"$:/StoryTiddlers" history:"$:/History" ><
+<<navigator story:"$:/StoryTiddlers" history:"$:/History" ><
 
 <!-- The top navigation bar -->
 <div class="navbar navbar-fixed-top">