Improve smart annotation in TinyMCE fields

This commit is contained in:
aignatov-bio 2020-09-24 13:29:20 +02:00
parent b6f038ff09
commit ff33cb45e0
2 changed files with 8 additions and 4 deletions

View file

@ -11,9 +11,11 @@ var selectedRow = null;
function initEditMyModuleDescription() {
var viewObject = $('#my_module_description_view');
viewObject.on('click', function() {
viewObject.on('click', function(e) {
if ($(e.target).hasClass('record-info-link')) return;
TinyMCE.init('#my_module_description_textarea');
}).on('click', 'a', function(e) {
if ($(this).hasClass('record-info-link')) return;
e.stopPropagation();
});
TinyMCE.initIfHasDraft(viewObject);
@ -21,9 +23,11 @@ function initEditMyModuleDescription() {
function initEditProtocolDescription() {
var viewObject = $('#protocol_description_view');
viewObject.on('click', function() {
viewObject.on('click', function(e) {
if ($(e.target).hasClass('record-info-link')) return;
TinyMCE.init('#protocol_description_textarea', refreshProtocolStatusBar);
}).on('click', 'a', function(e) {
if ($(this).hasClass('record-info-link')) return;
e.stopPropagation();
});
TinyMCE.initIfHasDraft(viewObject);

View file

@ -86,7 +86,7 @@ var SmartAnnotation = (function() {
},
tplEval: function(_tpl, items) {
var $items = $(items.name);
$items.find('li').data('item-data', []); // Emulate at.js insertContentFor method
$items.find('li').data('item-data', {'atwho-at': at}); // Emulate at.js insertContentFor method
return $items;
},
highlighter: function(li, query) {
@ -183,7 +183,7 @@ var SmartAnnotation = (function() {
},
tplEval: function(_tpl, items) {
var $items = $(items.name);
$items.find('li').data('item-data', []); // Emulate at.js insertContentFor method
$items.find('li').data('item-data', {'atwho-at': '@'}); // Emulate at.js insertContentFor method
return $items;
},
highlighter: function(li, query) {