icn3d 3.26.5 → 3.26.7

package/icn3d.module.js

@@ -45388,7 +45388,7 @@ class LineGraph {
                         pdb_query = header + pdb_query;
 
                         let dataObj = {'pdb_query': pdb_query, 'pdb_target': pdb_target, "queryid": ic.refpdbArray[index]};
-                        let alignAjax = (me.bNode) ? me.getAjaxPostPromise(urltmalign, dataObj, undefined, undefined, undefined, undefined, undefined, true) : me.getAjaxPostPromise(urltmalign, dataObj);
+                        let alignAjax = me.getAjaxPostPromise(urltmalign, dataObj);
                         ajaxArray.push(alignAjax);
                         
                         domainidpairArray.push(domainid + "|" + ic.refpdbArray[index]);
@@ -45405,7 +45405,8 @@ class LineGraph {
 
             //split arrays into chunks of 100 jobs
             let n = (me.bNode) ? 16 : 96;
-            for(let i = 0, il = (ajaxArray.length - 1) / n + 1; i < il; ++i) {
+
+            for(let i = 0, il = parseInt((ajaxArray.length - 1) / n + 1); i < il; ++i) {
                 let currAjaxArray = [];
                 if(i == il - 1) { // last one 
                     currAjaxArray = ajaxArray.slice(i * n, ajaxArray.length);
@@ -45419,7 +45420,6 @@ class LineGraph {
 
                 dataArray2 = dataArray2.concat(currDataArray);
             }
-
         
             let bRound1 = true;
             await thisClass.parseAlignData(dataArray2, domainidpairArray, bRound1);
@@ -45529,7 +45529,7 @@ class LineGraph {
 
             //if(!(bBstrand && bCstrand && bEstrand && bFstrand && bGstrand)) continue;
             if(!(bBstrand && bCstrand && bEstrand && bFstrand)) {
-                if(!me.bNode) console.log("some of the Ig strands B, C, E, F are missing...");
+                if(!me.bNode) console.log("Some of the Ig strands B, C, E, F are missing in the domain " + domainid + "...");
                 continue;
             }
 
@@ -72496,58 +72496,91 @@ iCn3DUI.prototype.setIcn3d = function() { let me = this;
     me.setDialogAjax();
 };
 
-iCn3DUI.prototype.getAjaxPromise = function(url, dataType, beforeSend, alertMess, logMess, complete) { let me = this;
-    return new Promise(function(resolve, reject) {
-        $.ajax({
-            url: url,
-            dataType: dataType,
-            cache: true,
-            beforeSend: function() {
-                if(beforeSend) me.icn3d.ParserUtilsCls.showLoading();
-            },
-            complete: function() {
-                if(complete) me.icn3d.ParserUtilsCls.hideLoading();
-            },
-            success: function(data) {
-                resolve(data);
-            },
-            error : function() {
-                if(alertMess) alert(alertMess);
-                if(logMess) console.log(logMess);
-                
-                reject('error');
-            }
+iCn3DUI.prototype.getAjaxPromise = function(url, dataType, beforeSend, alertMess, logMess, complete, bNode) { let me = this;
+    // if(!bNode || dataType != 'json') {
+        return new Promise(function(resolve, reject) {
+            $.ajax({
+                url: url,
+                dataType: dataType,
+                cache: true,
+                beforeSend: function() {
+                    if(beforeSend) me.icn3d.ParserUtilsCls.showLoading();
+                },
+                complete: function() {
+                    if(complete) me.icn3d.ParserUtilsCls.hideLoading();
+                },
+                success: function(data) {
+                    resolve(data);
+                },
+                error : function() {
+                    if(alertMess) alert(alertMess);
+                    if(logMess) console.log(logMess);
+                    
+                    reject('error');
+                }
+            });
         });
-    });
+    // }
+    // else {
+    //     return new Promise(async function(resolve, reject) {
+    //         const response = await fetch(url);
+
+    //         response.json().then(function(data) {
+    //             resolve(data);
+    //         }).catch(function(error) {
+    //             reject('error');
+    //         });
+    //     });
+    // }
 };
 
-iCn3DUI.prototype.getAjaxPostPromise = function(url, data, beforeSend, alertMess, logMess, complete, dataType) { let me = this;
+iCn3DUI.prototype.getAjaxPostPromise = async function(url, data, beforeSend, alertMess, logMess, complete, dataType, bNode) { let me = this;
     dataType = (dataType) ? dataType : 'json';
 
-    return new Promise(function(resolve, reject) {
-        $.ajax({
-            url: url,
-            type: 'POST',
-            data : data,
-            dataType: dataType,
-            cache: true,
-            beforeSend: function() {
-                if(beforeSend) me.icn3d.ParserUtilsCls.showLoading();
-            },
-            complete: function() {
-                if(complete) me.icn3d.ParserUtilsCls.hideLoading();
-            },
-            success: function(data) {
-                resolve(data);
-            },
-            error : function() {
-                if(alertMess) alert(alertMess);
-                if(logMess) console.log(logMess);
-                
-                reject('error');
-            }
+    // if(!bNode || dataType != 'json') {
+        return new Promise(function(resolve, reject) {
+            $.ajax({
+                url: url,
+                type: 'POST',
+                data : data,
+                dataType: dataType,
+                cache: true,
+                beforeSend: function() {
+                    if(beforeSend) me.icn3d.ParserUtilsCls.showLoading();
+                },
+                complete: function() {
+                    if(complete) me.icn3d.ParserUtilsCls.hideLoading();
+                },
+                success: function(data) {
+                    resolve(data);
+                },
+                error : function() {
+                    if(alertMess) alert(alertMess);
+                    if(logMess) console.log(logMess);
+                    
+                    reject('error');
+                }
+            });
         });
-    });
+    // }
+    // else {
+    //     return new Promise(async function(resolve, reject) {
+    //         const response = await fetch(url, {
+    //             method: 'POST',
+    //             headers: {
+    //                 'Accept': 'application/json',
+    //                 'Content-Type': 'application/json'
+    //             },
+    //             body: data
+    //         });
+
+    //         response.json().then(function(data) {
+    //             resolve(data);
+    //         }).catch(function(error) {
+    //             reject('error');
+    //         });
+    //     });
+    // }
 };
 
 iCn3DUI.prototype.setDialogAjax = function() { let me = this;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "icn3d",
-  "version": "3.26.5",
+  "version": "3.26.7",
   "main": "./icn3d.js",
   "exports": {
     ".": {