From c030f735a83969fbcb557514dc1739e8d58c2a66 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 28 Oct 2012 08:54:31 +0000
Subject: [PATCH] Keep the new tiddler positioning nozzle within the Cecily map

---
 core/modules/macros/list/list.js             |  4 +++-
 core/modules/macros/list/listviews/cecily.js | 13 +++++++------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/modules/macros/list/list.js b/core/modules/macros/list/list.js
index 013e4a42c..8f1ea0e54 100644
--- a/core/modules/macros/list/list.js
+++ b/core/modules/macros/list/list.js
@@ -117,7 +117,9 @@ exports.createListElement = function(title) {
 		attributes = {"class": ["tw-list-element"]},
 		eventHandler = {handleEvent: function(event) {
 			// Add context information to the event
-			event.navigateFromTitle = title;
+			if(!event.navigateFromTitle) {
+				event.navigateFromTitle = title;
+			}
 			return true;
 		}};
 	node.execute(this.parents,this.tiddlerTitle);
diff --git a/core/modules/macros/list/listviews/cecily.js b/core/modules/macros/list/listviews/cecily.js
index 6c19af13b..b60d32220 100644
--- a/core/modules/macros/list/listviews/cecily.js
+++ b/core/modules/macros/list/listviews/cecily.js
@@ -18,8 +18,6 @@ function CecilyListView(listMacro) {
 	// Prepare the list frame
 	var listFrameDomNode = this.listMacro.listFrame.domNode;
 	listFrameDomNode.style.position = "relative";
-	// Prepare the nozzle for dispensing new tiddlers onto the map
-	this.newTiddlerPosition = {x: 0, y: 0};
 	// Position the initial list entries on the map
 	this.loadMap();
 	for(var t=0; t<listFrameDomNode.children.length; t++) {
@@ -35,7 +33,10 @@ CecilyListView.prototype.getMapTiddlerTitle = function() {
 };
 
 CecilyListView.prototype.loadMap = function() {
-	this.map = this.listMacro.wiki.getTiddlerData(this.getMapTiddlerTitle(),{positions: {}});
+	this.map = this.listMacro.wiki.getTiddlerData(this.getMapTiddlerTitle(),{
+		positions: {},
+		newTiddlerPosition: {x: 0, y: 0}
+	});
 };
 
 CecilyListView.prototype.saveMap = function() {
@@ -53,12 +54,12 @@ CecilyListView.prototype.lookupTiddlerInMap = function(title,domNode) {
 	switch(this.map.positionNew) {
 		default: // "right"
 			newPosition = {
-				x: this.newTiddlerPosition.x,
-				y: this.newTiddlerPosition.y,
+				x: this.map.newTiddlerPosition.x,
+				y: this.map.newTiddlerPosition.y,
 				w: 100,
 				h: 100
 			};
-			this.newTiddlerPosition.x += newPosition.w * 1.2;
+			this.map.newTiddlerPosition.x += newPosition.w * 1.2;
 			break;
 	}
 	// A default position