get rid of JSRS iframe foo for progress bar, use XMLHTTPRequest instead. really should have done that in the first place. JSON will wait until another day...

1 files changed, 9 insertions, 3 deletions

diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 472a172..fb40840 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -11,7 +11,11 @@
   }
 %>
 
-<SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
+<%= include('/elements/xmlhttp.html',
+              'url'  => $action,
+              'subs' => [ 'start_job' ],
+           )
+%>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" SRC="../elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
@@ -54,8 +58,10 @@ function <%=$key%>process () {
     }
   }
 
-  jsrsPOST = true;
-  jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
+  // jsrsPOST = true;
+  // jsrsExecute( '<%= $action %>', <%=$key%>myCallback, 'start_job', Hash );
+
+  start_job( Hash, <%=$key%>myCallback );
 
 }