fixing loading bug

ncats · Apr 1, 2024 · e776cc5 · e776cc5
1 parent ab386fa
commit e776cc5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/projects/jsdraw-wrapper/src/lib/jsdraw-wrapper.component.ts b/projects/jsdraw-wrapper/src/lib/jsdraw-wrapper.component.ts
@@ -4,8 +4,8 @@ import { JSDraw } from './jsdraw.model';
 
 @Component({
   selector: 'ncats-jsdraw-wrapper',
-  template: `<div id="randomId" class="jsdrawRandom" dataformat="molfile"  style="width:968px"></div>`,
-  styles: ['::ng-deep .jsdrawRandom { width:968px !important}; ']
+  template: `<div [id]="randomId" dataformat="molfile"  ></div>`,
+  styles: []
 })
 export class JsdrawWrapperComponent implements AfterViewInit {
   randomId: string;

diff --git a/src/app/core/assets/jsdraw/JSDraw.extensions.js b/src/app/core/assets/jsdraw/JSDraw.extensions.js
@@ -912,7 +912,6 @@ var callback = function(){
         // Note that this is still an issue if there is more than one editor being used at one
         // time. JSDraw will need to fix.
         JSDraw2.Editor.atomlistDlg=null;
-        JSDraw2.Editor.width=960;
 
         // This prevents the context menu from spawning more events on right-click events
         (function() {

diff --git a/src/app/core/structure-editor/structure-editor.component.ts b/src/app/core/structure-editor/structure-editor.component.ts
@@ -174,8 +174,8 @@ export class StructureEditorComponent implements OnInit, AfterViewInit, OnDestro
        this.ketcher = ketcher;
        if (this.structureEditor === 'ketcher'){
 
-       this.editor = new EditorImplementation(this.ketcher);
-       this.editorOnLoad.emit(this.editor);
+    //   this.editor = new EditorImplementation(this.ketcher);
+     //  this.editorOnLoad.emit(this.editor);
        }
 
     }, 1000);
@@ -190,7 +190,7 @@ export class StructureEditorComponent implements OnInit, AfterViewInit, OnDestro
       this.editorOnLoad.emit(this.editor);
     } else {
       this.structureEditor = 'ketcher';
-      this.editor = new EditorImplementation(this.ketcher, null);
+      this.editor = new EditorImplementation(this.ketcher);
        this.editorOnLoad.emit(this.editor);
        console.log(this.jsdraw.options);
     }
@@ -199,10 +199,8 @@ export class StructureEditorComponent implements OnInit, AfterViewInit, OnDestro
   jsDrawOnLoad(jsdraw: JSDraw): void {
     console.log('loaded');
     this.jsdraw = jsdraw;
-    if (this.structureEditor === 'jsdraw'){
       this.editor = new EditorImplementation(null, this.jsdraw);
       this.editorOnLoad.emit(this.editor);
-    }
 
   }