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

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 7226f334a..f0b0e90a4 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016-2018 by the citadel.org team
+// Copyright (c) 2016-2019 by the citadel.org team
 //
 // This program is open source software; you can redistribute it and/or modify
 // it under the terms of the GNU General Public License version 3.
@@ -34,12 +34,11 @@ function _(x) {
 //
 function randomString(length) {
 	var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghiklmnopqrstuvwxyz'.split('');
+	var str = '';
 
-	if (! length) {
+	if (!length) {
 		length = Math.floor(Math.random() * chars.length);
 	}
-
-	var str = '';
 	for (var i = 0; i < length; i++) {
 		str += chars[Math.floor(Math.random() * chars.length)];
 	}
@@ -50,35 +49,35 @@ function randomString(length) {
 // string escape for html display
 //
 function escapeHTML(text) {
-    'use strict';
-    return text.replace(/[\"&<>]/g, function (a) {
-        return {
-		'"': '&quot;',
-		'&': '&amp;',
-		'<': '&lt;',
-		'>': '&gt;'
-	}[a];
-    });
+	'use strict';
+	return text.replace(/[\"&<>]/g, function (a) {
+		return {
+			'"': '&quot;',
+			'&': '&amp;',
+			'<': '&lt;',
+			'>': '&gt;'
+		}[a];
+	});
 }
 
 
 // string escape for html display
 //
 function escapeHTMLURI(text) {
-    'use strict';
-    return text.replace(/./g, function (a) {
-        return '%' + a.charCodeAt(0).toString(16);
-    });
+	'use strict';
+	return text.replace(/./g, function (a) {
+		return '%' + a.charCodeAt(0).toString(16);
+	});
 }
 
 
 // string escape for JavaScript string
 //
 function escapeJS(text) {
-    'use strict';
-    return text.replace(/[\"\']/g, function (a) {
-        return '\\' + a ;
-    });
+	'use strict';
+	return text.replace(/[\"\']/g, function (a) {
+		return '\\' + a ;
+	});
 }
 
 
@@ -96,6 +95,7 @@ function ctdl_startup() {
 	request = null;
 }
 
+
 // Continuation of ctdl_startup() after serv_info is retrieved
 //
 function ctdl_startup_2(data) {
@@ -112,6 +112,7 @@ function ctdl_startup_2(data) {
 	display_room_list();
 }
 
+
 // Display a room list in the main div.
 //
 function display_room_list() {
@@ -128,6 +129,7 @@ function display_room_list() {
 	request = null;
 }
 
+
 // Renderer for display_room_list()
 //
 function display_room_list_renderer(data) {
@@ -151,8 +153,10 @@ function display_room_list_renderer(data) {
 		}
 		new_roomlist_text = new_roomlist_text +
 			"<li>"
+			+ (data[i].hasnewmsgs ? "<b>" : "")
 			+ "<a href=\"javascript:gotoroom('" + escapeJS(escapeHTML(data[i].name)) + "');\">"
 			+ escapeHTML(data[i].name)
+			+ (data[i].hasnewmsgs ? "</b>" : "")
 			+ "</a></li>"
 		;
 	}
@@ -160,6 +164,7 @@ function display_room_list_renderer(data) {
 	document.getElementById("roomlist").innerHTML = new_roomlist_text ;
 }
 
+
 // Update the "banner" div with all relevant info.
 //
 function update_banner() {
@@ -209,14 +214,13 @@ 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) {
-		load_new_march_list();		// we will recurse back here. make sure length isn't still 0 if no new rooms
+		load_new_march_list();		// we will recurse back here
 	}
 	else {
 		next_room = march_list[0].name;
 		march_list.splice(0, 1);
-		console.log("going to " + next_room);
+		console.log("going to " + next_room + " , " + march_list.length + " rooms remaining in march list");
 		gotoroom(next_room);
 	}
 }
@@ -231,7 +235,7 @@ function load_new_march_list() {
 		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;
+				return room.hasnewmsgs;
 			});
 			march_list = march_list.sort(function(a,b) {
 				if (a.floor != b.floor) {
@@ -242,6 +246,7 @@ function load_new_march_list() {
 				}
 				return(a.name < b.name);
 			});
+			march_list.push({name:"_BASEROOM_",known:true,hasnewmsgs:true,floor:0});
 			gotonext();
 		}
 	};