From ccfa7e1322f0bb4d2c6b094b2209c3787356912b Mon Sep 17 00:00:00 2001
From: Jeremy Ruston <jeremy@osmosoft.com>
Date: Wed, 13 Jun 2012 16:09:07 +0100
Subject: [PATCH] Fixed the appearance of tag dropdowns

---
 core/modules/macros/button.js  | 2 +-
 core/templates/TagTemplate.tid | 4 +++-
 tw5.com/wiki/styles.css.tid    | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/core/modules/macros/button.js b/core/modules/macros/button.js
index 77acb3ca1..62747b366 100644
--- a/core/modules/macros/button.js
+++ b/core/modules/macros/button.js
@@ -68,7 +68,7 @@ exports.handleEvent = function(event) {
 			event.preventDefault();
 			return false;
 		case "tw-cancel-popup":
-			if(this.hasParameter("popup") && event.targetOfCancel !== this.domNode) {
+			if(this.hasParameter("popup") && !$tw.utils.domContains(this.domNode,event.targetOfCancel)) {
 				this.triggerPopup(event,true);
 			}
 			break;
diff --git a/core/templates/TagTemplate.tid b/core/templates/TagTemplate.tid
index 8efe2d137..e9e9a6c2a 100644
--- a/core/templates/TagTemplate.tid
+++ b/core/templates/TagTemplate.tid
@@ -1,10 +1,12 @@
 title: $:/templates/TagTemplate
 
+{{tw-tag-popup{
+<<button popup:MyTiddler qualifyTiddlerTitles:yes><
 {{label{
 <<color background:yes default:#888><
-<<button popup:MyTiddler qualifyTiddlerTitles:yes><
 <<view title>>
 >>
+}}}
 >>
 }}}
 <<reveal state:MyTiddler type:popup qualifyTiddlerTitles:yes><
diff --git a/tw5.com/wiki/styles.css.tid b/tw5.com/wiki/styles.css.tid
index e93ab53de..fa9567f0e 100644
--- a/tw5.com/wiki/styles.css.tid
+++ b/tw5.com/wiki/styles.css.tid
@@ -42,6 +42,13 @@ body {
 	position: static;
 }
 
+button.tw-tag-popup {
+	border: none;
+	background: none;
+	margin: 0;
+	padding: 0;
+}
+
 .tw-tags-wrapper .label {
 	margin-right: 6px;
 }