Update testcase

[eow] / static / eow.js

diff --git a/static/eow.js b/static/eow.js
index a0defc92b9fc76712ba573d994f697d06240f73e..631894f0b70ff92059ca0daa4dddb03d8bb3c4e2 100644 (file)
--- a/static/eow.js
+++ b/static/eow.js
@@ -1,92 +1,85 @@
-function eowOut(output) {
-  var t = document.createTextNode(output);
-  var p = document.createElement("pre");
-  p.appendChild(t);
-  dojo.byId("output").appendChild(p);
-  window.scrollTo(0, window.scrollMaxY);
+function setup() {
+  $.ajaxSetup({
+    timeout: 30000
+  });
+
+  $("#cmdline").ajaxForm({
+    url: "/eow/command",
+    type: "GET"
+  });
 }
 
-//t = window.setTimeout(f, 10000);
-//window.clearTimeout(t)
-//e = document.getElementById(id)
+function eowOut(output) {
+  $("#output").append("<pre>" + output + "</pre>");
+  $("input")[0].scrollIntoView(false);
+}
 
 function get_next_update() {
-  dojo.xhrGet( {
-    // The following URL must match that used to test the server.
-    url: "/eow/update", 
-    handleAs: "javascript",
-    //handleAs: "text",
-
-    timeout: 30000, // Time in milliseconds
-
-    // The LOAD function will be called on a successful response.
-    load: function(response, ioArgs) {
-      console.log(response);
-      return response;
+  $.ajax({
+    url: "/eow/update",
+    dataType: "script",
+    success: function(data, textStatus) {
+       console.log(textStatus + " " + data);
     },
+    error: function(xhr, textStatus, error) {
+      if (textStatus == "timeout") {
+       xhr.abort();
+       next();
+      }
 
-    // The ERROR function will be called in an error case.
-    error: function(response, ioArgs) {
-       if (response.dojoType == "timeout") {
-         ioArgs.xhr.abort();
-         get_next_update();
-         return response;
-       }
-
-       console.error("HTTP status code: ", ioArgs.xhr.status);
-       return response;
+      console.error("HTTP status code: ", xhr.status);
     }
   });
 }
 
-function submit_cmdline(cmdline_form) {
-  dojo.xhrGet( {
+function submit_cmdline(command) {
+  $.ajax({
     // The following URL must match that used to test the server.
     url: "/eow/command", 
-    handleAs: "text",
+    dataType: "text",
 
     timeout: 30000, // Time in milliseconds
 
     // The LOAD function will be called on a successful response.
-    load: function(response, ioArgs) {
-       console.log(response);
-       return response;
-      },
+    success: function(data, textStatus) {
+       console.log(textStatus + " " + data);
+    },
 
     // The ERROR function will be called in an error case.
-    error: function(response, ioArgs) {
-       if (response.dojoType == "timeout") {
-         ioArgs.xhr.abort();
-         return response;
-       }
+    error: function(xhr, textStatus, error) {
+      if (textStatus == "timeout") {
+       xhr.abort();
+      }
 
-       console.error("HTTP status code: ", ioArgs.xhr.status);
-       return response;
-      },
+      console.error("HTTP status code: ", xhr.status);
+    },
 
-    form: cmdline_form
+    data: {
+       "q": command
+      }
   });
 }
 
-function prompt(minutes, btus) {
-  dojo.byId("prompt").textContent = "[" + minutes + "," + btus + "]: ";
-  get_next_update();
+function prompt(p) {
+  $("#prompt").text(p);
 }
 
 function msg(m) {
   eowOut(m);
+}
+
+function next() {
   get_next_update();
 }
 
 function setup_client() {
-  var input = dojo.byId("inputfield");
-  input.focus();
+  $("#inputfield").focus();
 }
 
 function inputfield_keyup(e) {
   if (e.keyCode == 13) { // Enter
-    eowOut(dojo.byId("prompt").textContent + e.target.value);
-    submit_cmdline(e.target.form.id);
+    eowOut($("#prompt").text() + e.target.value);
+    submit_cmdline(e.target.value);
     window.scrollTo(0, window.scrollMaxY);
     e.target.value = "";
   }