1 files changed, 6 insertions, 16 deletions
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 200f97d9b..20bb5fc5a 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -10,35 +10,25 @@
   </HEAD>
   <BODY BGCOLOR="#ccccff" onLoad="refreshStatus()">
 
-<%= include('/elements/xmlhttp.html',
-              'url'  => $p.'elements/jsrsServer.html',
-              'subs' => [ 'job_status' ],
-           )
-%>
+<SCRIPT TYPE="text/javascript" SRC="../elements/jsrsClient.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" src="../elements/qlib/control.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" src="../elements/qlib/imagelist.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript" src="../elements/qlib/progress.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
 function refreshStatus () {
-  //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
-
-  job_status( '<%= $jobnum %>', updateStatus );
+  jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
 }
 function updateStatus( status_statustext ) {
-
-  //var Array = status_statustext.split("\n");
-  var statusArray = eval('(' + status_statustext + ')');
-  var status = statusArray[0];
-  var statustext = statusArray[1];
-
+  var Array = status_statustext.split("\n");
+  var status = Array[0];
+  var statustext = Array[1];
   //if ( status == 'progress' ) {
   //IE workaround, no i have no idea why
   if ( status.indexOf('progress') > -1 ) {
     document.getElementById("progress_percent").innerHTML = statustext + '%';
     bar1.set(statustext);
     bar1.update;
-    //jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
-    job_status( '<%= $jobnum %>', updateStatus );
+    jsrsExecute( '<%=$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<%= $jobnum %>' );
   } else if ( status.indexOf('complete') > -1 ) {
 <% if ( $message ) { %>
     document.getElementById("progress_message").innerHTML = "<%= $message %>";