icn3d 3.25.0 → 3.25.1

package/icn3d.js

@@ -2302,7 +2302,7 @@ THREE.TrackballControls = function ( object, domElement, icn3d ) {
             this.screen.width = window.innerWidth;
             this.screen.height = window.innerHeight;
 
-        } else {
+        } else if(this.domElement) {
 
             var box = this.domElement.getBoundingClientRect();
             // adjustments come from similar code in the jquery offset() function
@@ -2872,7 +2872,7 @@ THREE.TrackballControls = function ( object, domElement, icn3d ) {
 
     }
 
-    if(Object.keys(window).length >= 2) {
+    if(Object.keys(window).length >= 2 && this.domElement) {
         this.domElement.addEventListener( 'contextmn', function ( event ) {
             //event.preventDefault();
         }, false );
@@ -2998,7 +2998,7 @@ THREE.OrthographicTrackballControls = function ( object, domElement, icn3d ) { v
             this.screen.width = window.innerWidth;
             this.screen.height = window.innerHeight;
 
-        } else {
+        } else if(this.domElement) {
 
             var box = this.domElement.getBoundingClientRect();
             // adjustments come from similar code in the jquery offset() function
@@ -3548,7 +3548,7 @@ THREE.OrthographicTrackballControls = function ( object, domElement, icn3d ) { v
 
     }
 
-    if(Object.keys(window).length >= 2) {
+    if(Object.keys(window).length >= 2 && this.domElement) {
         this.domElement.addEventListener( 'contextmn', function ( event ) {
             //event.preventDefault();
         }, false );
@@ -59121,9 +59121,10 @@ class LoadScript {
 
         // load pdb, mmcif, mmdb, cid
         let id = loadStr.substr(loadStr.lastIndexOf(' ') + 1);
+        if(id.length == 4) id = id.toUpperCase();
 
         // skip loading the structure if it was loaded before
-        if(ic.structures.hasOwnProperty(id)) return;
+        if(ic.structures && ic.structures.hasOwnProperty(id)) return;
 
         ic.inputid = id;
         if(command.indexOf('load mmtf') !== -1) {
@@ -66306,7 +66307,7 @@ class SaveFile {
             if(me.utilsCls.isIE()) {
                 blob = ic.renderer.domElement.msToBlob();
 
-                if(bAddURL) {
+                if(bAddURL && typeof(blob) == 'Blob') {
                     let reader = new FileReader();
                     reader.onload = function(e) {
                         let arrayBuffer = e.target.result; // or = reader.result;
@@ -66332,7 +66333,7 @@ class SaveFile {
             }
             else {
                 ic.renderer.domElement.toBlob(function(data) {
-                    if(bAddURL) {
+                    if(bAddURL && typeof(blob) == 'data') {
                         let reader = new FileReader();
                         reader.onload = function(e) {
                             let arrayBuffer = e.target.result; // or = reader.result;
@@ -66404,19 +66405,26 @@ class SaveFile {
 
             let url = ic.shareLinkCls.shareLinkUrl();
 
+            url = url.replace(/imageonly=1/g, '');
+
             let bTooLong =(url.length > 4000 || url.indexOf('http') !== 0) ? true : false;
 
             if(bTooLong || (ic.bInputfile && !ic.bInputUrlfile)) {
-                $("#" + ic.pre + "viewer").html("<img src='" + imageUrl + "'/>");
+                // $("#" + ic.pre + "viewer").html("<img src='" + imageUrl + "'/>");
+                $("#" + ic.pre + "mnlist").html("<img src='" + imageUrl + "'/>");
             }
             else {
-                $("#" + ic.pre + "viewer").html("<a href='" + url + "' target='_blank'><img src='" + imageUrl + "'/></a>");
+                // $("#" + ic.pre + "viewer").html("<a href='" + url + "' target='_blank'><img src='" + imageUrl + "'/></a>");
+                $("#" + ic.pre + "mnlist").html("<a href='" + url + "' target='_blank'><img src='" + imageUrl + "'/></a>");
             }
             
             $("#" + ic.pre + "viewer").height(height);
-            $("#" + ic.pre + "mnlist").hide();
             $("#" + ic.pre + "cmdlog").hide();
             $("#" + ic.pre + "title").hide();
+            //$("#" + ic.pre + "mnlist").hide();
+            $("#" + ic.pre + "canvas").hide(); // "load mmdbid ..." may cause problems if canvas was removed
+
+            if($("#" + ic.pre + "fullscreen").length > 0) $("#" + ic.pre + "fullscreen").hide();
 
             // clear memory
             ic = {};
@@ -67365,6 +67373,10 @@ class ShareLink {
                    if(key_value.length == 2) paraHash[key_value[0]] = key_value[1];
                }
 
+               if(me.cfg.notebook && me.cfg.idname && !paraHash[me.cfg.idname]) { // somehow it is not included
+                    url += me.cfg.idname + '=' + me.cfg.idvalue + '&';
+               }
+
                for(let key in paraHash) {
                    if(key === 'v') continue;
 
@@ -67404,7 +67416,7 @@ class ShareLink {
            transformation.quaternion = ic.quaternion;
 
            let statefile = "";
-           let prevCommandStr = undefined;
+           let prevCommandStr = "";
 
            let toggleStr = 'toggle highlight';
            let cntToggle = 0;