diff --git a/ippisite/ippidb/static/js/ippidb-marvinjsmodal.js b/ippisite/ippidb/static/js/ippidb-marvinjsmodal.js index 99a0e7917b0431045dde67bf4059ed283aa38731..d7d142a7c20f600033fe84c43bee04a2583f7e68 100644 --- a/ippisite/ippidb/static/js/ippidb-marvinjsmodal.js +++ b/ippisite/ippidb/static/js/ippidb-marvinjsmodal.js @@ -6,7 +6,7 @@ class MarvinModal { this.textAreaEl = $('#' + textAreaId); this.exportCallback = exportCallback; this.marvinSketcherInstance = null; - MarvinJSUtil.getEditor("marviniframe").then(function(sketcherInstance) { + MarvinJSUtil.getEditor(iframeId).then(function(sketcherInstance) { this.marvinSketcherInstance = sketcherInstance; this.marvinSketcherInstance.on('molchange', function(){ this.exportSmiles(function(smilesString){ @@ -17,8 +17,8 @@ class MarvinModal { this.modalEl.on('shown.bs.modal', function(){ //NB: this must be setup only once the modal is shown otherwise // it doesn't work with Firefox (see https://bugzilla.mozilla.org/show_bug.cgi?id=941146) - var query = $('#marviniframe').attr('data-smiles'); - var fingerprint = $('#marviniframe').attr('data-fingerprint'); + var query = this.iframeEl.attr('data-smiles'); + var fingerprint = this.iframeEl.attr('data-fingerprint'); $("input[name=fingerprint][value=" + fingerprint + "]").attr('checked', 'checked') this.importSmiles(query); this.textAreaEl.val(query);