From 22b58b790d006b0e989a77738e2d4271b2947c27 Mon Sep 17 00:00:00 2001 From: fkloft Date: Sat, 14 Feb 2015 14:49:52 +0100 Subject: [PATCH] [player-tracker] use markup for seach results and prevent chat from handling events --- plugins/player-tracker.user.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/plugins/player-tracker.user.js b/plugins/player-tracker.user.js index 2dc04f71..4f03be42 100644 --- a/plugins/player-tracker.user.js +++ b/plugins/player-tracker.user.js @@ -522,20 +522,23 @@ window.plugin.playerTracker.centerMapOnUser = function(nick) { if(data.marker) { window.plugin.playerTracker.onClickListener({target: data.marker}); } + return true; } window.plugin.playerTracker.onNicknameClicked = function(info) { if (info.event.ctrlKey || info.event.metaKey) { - plugin.playerTracker.centerMapOnUser(info.nickname); - return false; + return !plugin.playerTracker.centerMapOnUser(info.nickname); } + return true; // don't interrupt hook } window.plugin.playerTracker.onSearchResultSelected = function(result, event) { + event.stopPropagation(); // prevent chat from handling the click + if(window.isSmartphone()) window.show('map'); // if the user moved since the search was started, check if we have a new set of data - if(false === window.plugin.playerTracker.centerMapOnUser(result.title)) + if(false === window.plugin.playerTracker.centerMapOnUser(result.nickname)) map.setView(result.position); if(event.type == 'dblclick') @@ -553,7 +556,8 @@ window.plugin.playerTracker.onSearch = function(query) { var event = data.events[data.events.length - 1]; query.addResult({ - title: nick, + title: '' + nick + '', + nickname: nick, description: data.team.substr(0,3) + ', last seen ' + unixTimeToDateTimeString(event.time), position: plugin.playerTracker.getLatLngFromEvent(event), onSelected: window.plugin.playerTracker.onSearchResultSelected,