From f1089c1c92d52ef7f7b850929788c0fb8afe5079 Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Sun, 11 Nov 2012 15:03:34 +0000
Subject: [PATCH] Use temporary tiddlers for popup locations

---
 core/modules/macros/reveal.js           | 2 +-
 core/modules/utils/dom/popup.js         | 2 +-
 core/templates/SearchResultTemplate.tid | 4 ++--
 core/templates/TagTemplate.tid          | 4 ++--
 core/templates/ViewTemplate.tid         | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/core/modules/macros/reveal.js b/core/modules/macros/reveal.js
index 253ecbec6..5be73ca46 100644
--- a/core/modules/macros/reveal.js
+++ b/core/modules/macros/reveal.js
@@ -100,7 +100,7 @@ exports.handleEvent = function(event) {
 exports.executeMacro = function() {
 	this.stateTextRef = this.params.state;
 	if(this.hasParameter("qualifyTiddlerTitles")) {
-		this.stateTextRef = "(" + this.parents.join(",") + "," + this.tiddlerTitle + ")" + this.stateTextRef;
+		this.stateTextRef = this.stateTextRef + "(" + this.parents.join(",") + "," + this.tiddlerTitle + ")";
 	}
 	this.readState();
 	var attributes = {
diff --git a/core/modules/utils/dom/popup.js b/core/modules/utils/dom/popup.js
index 37157e18a..74ce1c590 100644
--- a/core/modules/utils/dom/popup.js
+++ b/core/modules/utils/dom/popup.js
@@ -57,7 +57,7 @@ Popup.prototype.triggerPopup = function(options) {
 	// Get the textref of the popup state tiddler
 	var textRef = options.textRef;
 	if(options.qualifyTiddlerTitles === "yes") {
-		textRef = "(" + options.contextParents.join(",") + "," + options.contextTiddlerTitle + ")" + textRef;
+		textRef = textRef + "(" + options.contextParents.join(",") + "," + options.contextTiddlerTitle + ")";
 	}
 	// Get the current popup state tiddler
 	var value = options.wiki.getTextReference(textRef,"",options.contextTiddlerTitle);
diff --git a/core/templates/SearchResultTemplate.tid b/core/templates/SearchResultTemplate.tid
index 96078c962..a8fbc129e 100644
--- a/core/templates/SearchResultTemplate.tid
+++ b/core/templates/SearchResultTemplate.tid
@@ -3,14 +3,14 @@ title: $:/templates/SearchResultTemplate
 {{tw-search-result{
 <li>
 
-<<link throughField:title hover:SearchPreviewDropDownLocation qualifyHoverTitle:yes><
+<<link throughField:title hover:"$:/temp/SearchPreviewDropDownLocation" qualifyHoverTitle:yes><
 <<view title text>>
 >>
 
 </li>
 }}}
 
-<<reveal state:SearchPreviewDropDownLocation type:popup position:right qualifyTiddlerTitles:yes><
+<<reveal state:"$:/temp/SearchPreviewDropDownLocation" type:popup position:right qualifyTiddlerTitles:yes><
 
 <div class="tw-tiddler-frame" style="color: black; width: 400px;">
 
diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index 5658e543e..7067fda24 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/TagTemplate
 
 {{btn-invisible{
-<<button popup:TagDropDownLocation qualifyTiddlerTitles:yes><
+<<button popup:"$:/temp/TagDropDownLocation" qualifyTiddlerTitles:yes><
 {{label{
 <<color background:yes default:#aaa><
 <<view title>>
@@ -9,7 +9,7 @@ title: $:/templates/TagTemplate
 }}}
 >>
 }}}
-<<reveal state:TagDropDownLocation type:popup qualifyTiddlerTitles:yes><
+<<reveal state:"$:/temp/TagDropDownLocation" type:popup qualifyTiddlerTitles:yes><
 
 <div class="open">
 
diff --git a/core/templates/ViewTemplate.tid b/core/templates/ViewTemplate.tid
index 49868246f..7d1a64c2c 100644
--- a/core/templates/ViewTemplate.tid
+++ b/core/templates/ViewTemplate.tid
@@ -1,7 +1,7 @@
 title: $:/templates/ViewTemplate
 modifier: JeremyRuston
 
-<<button popup:FieldsDropDownLocation qualifyTiddlerTitles:yes class:"btn-invisible"><
+<<button popup:"$:/temp/FieldsDropDownLocation" qualifyTiddlerTitles:yes class:"btn-invisible"><
 <span class="title"><<view title>> </span>
 >>
 <span> <<reveal state:[[$:/EditMode]] type:match text:yes>< <<button EditTiddler class:"btn-invisible"><[img[$:/core/images/edit-button.svg]]>> >> </span>
@@ -9,7 +9,7 @@ modifier: JeremyRuston
 
 <div class:"small"><<view modifier link>> <<view modified relativedate>></div>
 
-<<reveal state:FieldsDropDownLocation type:popup qualifyTiddlerTitles:yes><
+<<reveal state:"$:/temp/FieldsDropDownLocation" type:popup qualifyTiddlerTitles:yes><
 
 <div class="open">