diff --git a/app/assets/javascripts/sitewide/marvinjs_editor.js b/app/assets/javascripts/sitewide/marvinjs_editor.js index f046a558e..c760546b5 100644 --- a/app/assets/javascripts/sitewide/marvinjs_editor.js +++ b/app/assets/javascripts/sitewide/marvinjs_editor.js @@ -320,13 +320,16 @@ $(document).on('click', '.gene-sequence-edit-button', function() { }); function initMarvinJs() { - if (typeof (ChemicalizeMarvinJs) === 'undefined') { - setTimeout(initMarvinJs, 100); - return; + if (!window.MarvinJsEditor) { + MarvinJsEditor = MarvinJsEditorApi(); } - MarvinJsEditor = MarvinJsEditorApi(); if (MarvinJsEditor.enabled()) { + if (typeof (ChemicalizeMarvinJs) === 'undefined') { + setTimeout(initMarvinJs, 100); + return; + } + if ($('#marvinjs-editor')[0].dataset.marvinjsMode === 'remote') { ChemicalizeMarvinJs.createEditor('#marvinjs-sketch').then(function(marvin) { marvin.setDisplaySettings({ toolbars: 'reporting' });