X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fviews.js;h=4acd6b399dc5d9e282a4d1920634f19d1b6f669e;hb=e67940245363b2569c61ea12f1290790645c6387;hp=5ce6f762c366271c72f3e9e3cf360fcbc96049fb;hpb=3b3c4c880427373283d4f6b2d798d503fc4a813f;p=citadel.git
diff --git a/webcit-ng/static/js/views.js b/webcit-ng/static/js/views.js
index 5ce6f762c..4acd6b399 100644
--- a/webcit-ng/static/js/views.js
+++ b/webcit-ng/static/js/views.js
@@ -41,7 +41,8 @@ function render_room_view(gt_msg, lt_msg)
forum_readmessages("ctdl-main", gt_msg, lt_msg);
break;
default:
- document.getElementById("ctdl-main").innerHTML = "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
+ document.getElementById("ctdl-main").innerHTML =
+ "The view for " + current_room + " is " + current_view + " but there is no renderer." ;
break;
}
@@ -107,7 +108,10 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
// Render the divs (we will fill them in later)
for (var i in msgs)
{
- document.getElementById(target_div).innerHTML += "
#" + msgs[i] + "
" ;
+ document.getElementById(target_div).innerHTML +=
+ "#" + msgs[i]
+ + "
" ;
}
if (lt_msg == 9999999999)
{
@@ -122,8 +126,8 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
}
document.getElementById(target_div).innerHTML +=
"" ;
+ ""
+ + "link to msgs greater than " + newgt + "" ;
}
// Now figure out where to scroll to after rendering.
@@ -149,7 +153,8 @@ function forum_readmessages(target_div, gt_msg, lt_msg)
}
else
{
- document.getElementById(target_div).innerHTML = original_text; // this will make the link reappear so the user can try again
+ // if xhr fails, this will make the link reappear so the user can try again
+ document.getElementById(target_div).innerHTML = original_text;
}
}
};
@@ -173,7 +178,7 @@ function forum_render_messages(msgs, prefix, scroll_to)
function forum_render_one(div, msgnum, scroll_to)
{
var request = new XMLHttpRequest();
- request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgs[i] + "/json", false); // false == synchronous
+ request.open("GET", "/ctdl/r/" + escapeHTMLURI(current_room) + "/" + msgs[i] + "/json", true);
request.onreadystatechange = function()
{
if (this.readyState === 4)
@@ -187,8 +192,8 @@ function forum_render_one(div, msgnum, scroll_to)
+ "" // begin avatar
+ " " // FIXME temporary avatar
+ "
" // end avatar
- + "" // begin content
- + "
" // begin header
+ + "
" // begin content
+ + "