From cc115f0be87873a16d73668804bba72738e9ac15 Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Thu, 20 Jun 2024 16:23:14 +0200 Subject: [PATCH] Fix marvinjs initialization for local marvinjs setup --- app/assets/javascripts/sitewide/marvinjs_editor.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/sitewide/marvinjs_editor.js b/app/assets/javascripts/sitewide/marvinjs_editor.js index f046a558e..0a6c17648 100644 --- a/app/assets/javascripts/sitewide/marvinjs_editor.js +++ b/app/assets/javascripts/sitewide/marvinjs_editor.js @@ -320,14 +320,16 @@ $(document).on('click', '.gene-sequence-edit-button', function() { }); function initMarvinJs() { - if (typeof (ChemicalizeMarvinJs) === 'undefined') { + const isRemote = $('#marvinjs-editor')[0].dataset.marvinjsMode === 'remote'; + + if (isRemote && typeof (ChemicalizeMarvinJs) === 'undefined') { setTimeout(initMarvinJs, 100); return; } MarvinJsEditor = MarvinJsEditorApi(); if (MarvinJsEditor.enabled()) { - if ($('#marvinjs-editor')[0].dataset.marvinjsMode === 'remote') { + if (isRemote) { ChemicalizeMarvinJs.createEditor('#marvinjs-sketch').then(function(marvin) { marvin.setDisplaySettings({ toolbars: 'reporting' }); marvinJsRemoteEditor = marvin;