Mercurial > urweb

diff lib/js/urweb.js @ 2280:985c8016b592
Merge.
author: Ziv Scully <ziv@mit.edu>
date: Thu, 12 Nov 2015 08:46:51 -0500
parents: 43393a4a66ce
children: fc1c89627178
--- a/lib/js/urweb.js	Wed Nov 11 20:01:48 2015 -0500
+++ b/lib/js/urweb.js	Thu Nov 12 08:46:51 2015 -0500
@@ -149,6 +149,10 @@
     return Math.round(tm / 1000);
 }
 
+function fromMilliseconds(tm) {
+    return tm * 1000;
+}
+
 function addSeconds(tm, n) {
     return tm + n * 1000000;
 }
@@ -468,8 +472,11 @@
     connectHandlers = cons(flift(f), connectHandlers);
 }
 
-function conn() {
-    runHandlers("Connect", connectHandlers, null);
+function conn(msg) {
+    var rx = /(.*)<body>((.|\n|\r)*)<\/body>(.*)/g;
+    var arr = rx.exec(msg);
+    msg = (arr && arr.length >= 3) ? arr[2] : msg;
+    runHandlers("RPC failure", connectHandlers, msg);
 }
 
 var serverHandlers = null;
@@ -1468,6 +1475,14 @@
     return ((str1 == str2) ? 0 : ((str1 > str2) ? 1 : -1));
 }
 
+function chr(n) {
+    return String.fromCharCode(n);
+}
+
+function htmlifySpecialChar(ch) {
+    return "&#" + ch.charCodeAt(0) + ";";
+}
+
 
 // Remote calls
 
@@ -1591,7 +1606,7 @@
                 }
             } else {
                 if (isN == null)
-                    conn();
+                    conn(xhr.responseText);
                 else
                     k(null);
             }