scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-04-29 17:27:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix TinyMCE blocking turbolinks [SCI-7729]

Browse source
This commit is contained in:
Martin Artnik 2023-01-12 12:09:44 +01:00
parent 33dca201ba
commit 3e65ae921c
2 changed files with 3 additions and 3 deletions
app
assets/javascripts/my_modules
protocols.js
javascript/packs
tiny_mce.js

2
app/assets/javascripts/my_modules/protocols.js
View file

@ -24,7 +24,7 @@ function initEditProtocolDescription() {
var viewObject = $('#protocol_description_view');
viewObject.on('click', function(e) {
if ($(e.target).hasClass('record-info-link')) return;
TinyMCE.init('#protocol_description_textarea', refreshProtocolStatusBar);
TinyMCE.init('#protocol_description_textarea', { afterInitCallback: refreshProtocolStatusBar });
}).on('click', 'a', function(e) {
if ($(this).hasClass('record-info-link')) return;
e.stopPropagation();

4
app/javascript/packs/tiny_mce.js vendored
View file

@ -36,7 +36,7 @@ import './tinymce/image_toolbar/plugin';
import 'raw-loader';
import contentCss from '!!raw-loader!tinymce/skins/content/default/content.min.css';
import contentUiCss from '!!raw-loader!tinymce/skins/ui/tinymce-5/content.min.css';
const contentStyle = [contentCss, contentUiCss].map((s) => s.toString() ).join("\n");
const contentStyle = [contentCss, contentUiCss].map((s) => s.toString() ).join("\n");
window.TinyMCE = (() => {
function initHighlightjs() {
@ -472,5 +472,5 @@ $(document).on('turbolinks:before-visit', (e) => {
e.preventDefault();
return false;
}
return false;
return true;
});