X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fmain.js;h=7226f334aad138163ec35b352481a52984efe706;hb=d45e366cffaa9c8b06291ac5d435f6f44cde8213;hp=5c200b3109c65b3bde37327a1a9e7487efd4fa8d;hpb=f35d620e8b0acf2db8b57ebd2ddaf3d01516ed58;p=citadel.git

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 5c200b310..7226f334a 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -207,19 +207,44 @@ function gotoroom_2(data) {
 
 
 // Goto next room with unread messages
+//
 function gotonext() {
 	console.log("march list contains " + march_list.length );
 	if (march_list.length == 0) {
-		march_list = [ 
-			{"rorder":0,"name":"CitaNews","known":true,"hasnewmsgs":true,"floor":0} ,
-			{"rorder":0,"name":"Hot Rodding","known":true,"hasnewmsgs":true,"floor":0} ,
-			{"rorder":0,"name":"_BASEROOM_","known":true,"hasnewmsgs":true,"floor":0} ,
-		] ;
-		// FIXME load the room list then start over, probably ok to recurse
+		load_new_march_list();		// we will recurse back here. make sure length isn't still 0 if no new rooms
 	}
 	else {
 		next_room = march_list[0].name;
 		march_list.splice(0, 1);
+		console.log("going to " + next_room);
 		gotoroom(next_room);
 	}
 }
+
+
+// Called by gotonext() when the march list is empty.
+//
+function load_new_march_list() {
+	var request = new XMLHttpRequest();
+	request.open("GET", "/ctdl/r/", true);
+	request.onreadystatechange = function() {
+		if ((this.readyState === 4) && ((this.status / 100) == 2)) {
+			march_list = (JSON.parse(this.responseText));
+			march_list = march_list.filter(function(room) {
+				return room.hasnewmsgs == true;
+			});
+			march_list = march_list.sort(function(a,b) {
+				if (a.floor != b.floor) {
+					return(a.floor - b.floor);
+				}
+				if (a.rorder != b.rorder) {
+					return(a.rorder - b.rorder);
+				}
+				return(a.name < b.name);
+			});
+			gotonext();
+		}
+	};
+	request.send();
+	request = null;
+}