0.5.1 close popups on click & fix modifier keys

tobibeer · Jan 14, 2016 · a63a34c · a63a34c
1 parent 2e0f8cf
commit a63a34c
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/editions/preview/tiddlers/content/preview-Install.tid b/editions/preview/tiddlers/content/preview-Install.tid
@@ -11,5 +11,5 @@ type: text/vnd.tiddlywiki
 
 !! Version History
 
-; 0.5.0 / 2016-01-14
+; 0.5.1 / 2016-01-14
 : initial version
diff --git a/plugins/tobibeer/preview/defaults.multids b/plugins/tobibeer/preview/defaults.multids
@@ -1,6 +1,6 @@
 title: $:/plugins/tobibeer/preview/
 
-lingo/keys: modifier keys to trigger popup directly on-hover (alt, ctrl, shift, meta)
+lingo/keys: modifier keys to trigger popup directly on-hover (ctrl, alt+shift, meta, etc...)
 defaults/keys: CTRL
 
 lingo/delay: delay popup for this many milliseconds

diff --git a/plugins/tobibeer/preview/plugin.info b/plugins/tobibeer/preview/plugin.info
@@ -2,7 +2,7 @@
     "title": "$:/plugins/tobibeer/preview",
     "description": "Shows a tiddler preview when hovering internal links",
     "author": "Tobias Beer",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "core-version": ">=5.1.9",
     "source": "https://github.com/tobibeer/tw5-preview",
     "documentation": "https://tobibeer.github.io/tw5-preview",

diff --git a/plugins/tobibeer/preview/popup.tid b/plugins/tobibeer/preview/popup.tid
@@ -12,7 +12,6 @@ tc-popup appear appear-block tc-preview-tiddler tc-preview-tiddler-$num$ $(defau
 \define level(num)
 <$reveal tag="div" type="popup" state=<<state $num$>> class=<<classes $num$>>>
 <$tiddler tiddler={{$:/temp/tobibeer/preview-$num$-tiddler}}>
-
 <$transclude tiddler={{$:/plugins/tobibeer/preview/defaults/template}} mode="block"/>
 </$tiddler>
 </$reveal>

diff --git a/plugins/tobibeer/preview/startup.js b/plugins/tobibeer/preview/startup.js
diff --git a/src/defaults.multids b/src/defaults.multids
@@ -1,6 +1,6 @@
 title: $:/plugins/tobibeer/preview/
 
-lingo/keys: modifier keys to trigger popup directly on-hover (alt, ctrl, shift, meta)
+lingo/keys: modifier keys to trigger popup directly on-hover (ctrl, alt+shift, meta, etc...)
 defaults/keys: CTRL
 
 lingo/delay: delay popup for this many milliseconds

diff --git a/src/plugin.info b/src/plugin.info
@@ -2,7 +2,7 @@
     "title": "$:/plugins/tobibeer/preview",
     "description": "Shows a tiddler preview when hovering internal links",
     "author": "Tobias Beer",
-    "version": "0.5.0",
+    "version": "0.5.1",
     "core-version": ">=5.1.9",
     "source": "https://github.com/tobibeer/tw5-preview",
     "documentation": "https://tobibeer.github.io/tw5-preview",

diff --git a/src/startup.js b/src/startup.js
@@ -126,6 +126,11 @@ CoreLink.prototype.render = function() {
 				if(e === "mouseover") {
 					// Actually showing anything?
 					if(show()) {
+						// No keycode?
+						if(!ev.keyCode) {
+							// Set to 0, for whatever reason the core expects one
+							ev.keyCode = 0;
+						}
 						// Modifier keys say we show directly?
 						if($tw.utils.checkKeyDescriptor(ev,keys)) {
 							// Then show
@@ -154,6 +159,8 @@ CoreLink.prototype.handleClickEvent = function() {
 	clickCore.apply(this,arguments);
 	// Abort popup delay timeout
 	clearTimeout(this.delayTimeout);
+	// Close popups
+	$tw.popup.cancel(Math.max(0,$tw.popup.popupInfo(this).popupLevel-1));
 };
 
 // Hijack popupInfo() of core Popup ($tw.popup)