From fd7773a3dccbdca48d6e2ca24a2eeac511c1302c Mon Sep 17 00:00:00 2001 From: aignatov-bio Date: Tue, 22 Sep 2020 10:15:01 +0200 Subject: [PATCH] Fix smart annotation cursor position --- app/assets/javascripts/sitewide/atwho_res.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/sitewide/atwho_res.js b/app/assets/javascripts/sitewide/atwho_res.js index 501884daa..977064ce5 100644 --- a/app/assets/javascripts/sitewide/atwho_res.js +++ b/app/assets/javascripts/sitewide/atwho_res.js @@ -85,7 +85,9 @@ var SmartAnnotation = (function() { return true; }, tplEval: function(_tpl, items) { - return items.name; + var $items = $(items.name); + $items.find('li').data('item-data', []); // Emulate at.js insertContentFor method + return $items; }, highlighter: function(li, query) { return matchHighlighter(li, query); @@ -123,7 +125,7 @@ var SmartAnnotation = (function() { $(field) .on('shown.atwho', function() { var $currentAtWho = $('.atwho-view[style]:not(.old)'); - var atWhoId = $currentAtWho.find('.atwho-header-res').data('at-who-key') + var atWhoId = $currentAtWho.find('.atwho-header-res').data('at-who-key'); $currentAtWho.addClass('old').attr('data-at-who-id', atWhoId); $(field).attr('data-smart-annotation', atWhoId); @@ -140,7 +142,7 @@ var SmartAnnotation = (function() { }); if ($currentAtWho.find('.tab-pane.active').length === 0) { - let filterType = DEFAULT_SEARCH_FILTER.tag; + let filterType = DEFAULT_SEARCH_FILTER.tag; let teamId = $currentAtWho.find('.atwho-header-res').data('team-id'); let remeberedState = localStorage.getItem('smart_annotation_states/teams/' + teamId); if (remeberedState) { @@ -179,8 +181,10 @@ var SmartAnnotation = (function() { callback(data.users); }); }, - tplEval: function(_tpl, map) { - return map.name; + tplEval: function(_tpl, items) { + var $items = $(items.name); + $items.find('li').data('item-data', []); // Emulate at.js insertContentFor method + return $items; }, highlighter: function(li, query) { return matchHighlighter(li, query);