Changeset 21028

Timestamp:

07/27/16 17:24:54 (9 years ago)

Author:

dlcheng

Message:

CHG (JS): Adding slow connection request handling.

Location:

issm/trunk-jpl/src/m

Files:

• classes/clusters/generic.js (modified) (1 diff)
• solve/solve.js (modified) (2 diffs)

issm/trunk-jpl/src/m/classes/clusters/generic.js ¶

@@ -51 +51 @@
                 $(callbackid).html(sprintf("%-16s", "CONNECTING...")).prop("disabled", true);
                 request.position = 0; //Keep track of current parsing position in repsonseText
-                request.timeout = 30000;
+                request.timeout = 180000;
                 request.ontimeout = function (event) { //{{{
-                        $(callbackid).html(sprintf("%-16s", "RUN")).prop("disabled", false);
+                        $(callbackid).html(sprintf("%-16s", "TIMEOUT")).prop("disabled", false);
+                        callbackerrorfunction();
                 } //}}}
                 request.onerror = function (event) { //{{{
                         $(callbackid).html(sprintf("%-16s", "COULD NOT RUN")).prop("disabled", false);
-                        solving=false;
-                        console.log(event);
+                        callbackerrorfunction();
                 } //}}}
                 request.upload.onprogress = function(event) { //{{{

issm/trunk-jpl/src/m/solve/solve.js ¶

@@ -103 +103 @@
 
         //callback function: 
-        function callbackfunction(){}; //default, do nothing if no callback function requested.
+        function callbackfunction(){solving=false;}; //default, do nothing if no callback function requested.
         if (options.getfieldvalue('callbackfunction',false)){
                 callbackfunction=options.getfieldvalue('callbackfunction');
@@ -109 +109 @@
         
         //callback error function: 
-        function callbackerrorfunction(){}; //default, do nothing if no callback function requested.
+        function callbackerrorfunction(){solving=false;}; //default, do nothing if no callback function requested.
         if (options.getfieldvalue('callbackerrorfunction',false)){
                 callbackerrorfunction=options.getfieldvalue('callbackerrorfunction');