scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-03 21:49:23 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2873 from aignatov-bio/ai-sci-5038-small-smart-annotation-fixes

Browse source 
Small smart annotation fixes [SCI-5038]
This commit is contained in:
aignatov-bio 2020-09-29 13:06:58 +02:00 committed by GitHub
commit c53753b294
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/protocols/header.js
View file

@ -22,8 +22,12 @@ var ProtocolRepositoryHeader = (function() {
function initEditDescription() { function initEditDescription() {
var viewObject = $('#protocol_description_view'); 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'); TinyMCE.init('#protocol_description_textarea');
}).on('click', 'a', function(e) {
if ($(this).hasClass('record-info-link')) return;
e.stopPropagation();
}); });
TinyMCE.initIfHasDraft(viewObject); TinyMCE.initIfHasDraft(viewObject);
} }

2
config/initializers/constants.rb
View file

@ -318,7 +318,7 @@ class Constants
WHITELISTED_ATTRIBUTES = [ WHITELISTED_ATTRIBUTES = [
'href', 'src', 'width', 'height', 'alt', 'cite', 'datetime', 'title', 'href', 'src', 'width', 'height', 'alt', 'cite', 'datetime', 'title',
'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border' 'class', 'name', 'xml:lang', 'abbr', 'style', 'target', :data, 'border', 'contenteditable'
].freeze ].freeze
WHITELISTED_CSS_ATTRIBUTES = { WHITELISTED_CSS_ATTRIBUTES = {