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

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 31e7ad0ba..f0b0e90a4 100644
--- a/webcit-ng/static/js/main.js
+++ b/webcit-ng/static/js/main.js
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2016-2017 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.
@@ -18,6 +18,9 @@ var current_view = 0;
 var logged_in = 0;
 var current_user = _("Not logged in.");
 var serv_info;
+var last_seen = 0;
+var messages_per_page = 20;
+var march_list = [] ;
 
 
 // Placeholder for when we add i18n later
@@ -30,13 +33,12 @@ function _(x) {
 // Useful for generating one-time-use div names
 //
 function randomString(length) {
-	var chars = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz'.split('');
+	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)];
 	}
@@ -47,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 ;
+	});
 }
 
 
@@ -93,6 +95,7 @@ function ctdl_startup() {
 	request = null;
 }
 
+
 // Continuation of ctdl_startup() after serv_info is retrieved
 //
 function ctdl_startup_2(data) {
@@ -109,10 +112,11 @@ function ctdl_startup_2(data) {
 	display_room_list();
 }
 
+
 // Display a room list in the main div.
 //
 function display_room_list() {
-	document.getElementById("sidebar").innerHTML = "<img src=\"/ctdl/s/throbber.gif\" />" ;		// show throbber while loading
+	document.getElementById("roomlist").innerHTML = "<img src=\"/ctdl/s/throbber.gif\" />" ;		// show throbber while loading
 
 	var request = new XMLHttpRequest();
 	request.open("GET", "/ctdl/r/", true);
@@ -125,6 +129,7 @@ function display_room_list() {
 	request = null;
 }
 
+
 // Renderer for display_room_list()
 //
 function display_room_list_renderer(data) {
@@ -138,31 +143,35 @@ function display_room_list_renderer(data) {
 		return(a.name < b.name);
 	});
 
-	new_sidebar_text = "<ul>" ;
+	new_roomlist_text = "<ul>" ;
 
 	for (var i in data) {
 		if (i > 0) {
 			if (data[i].floor != data[i-1].floor) {
-				new_sidebar_text = new_sidebar_text + "<li class=\"divider\"></li>" ;
+				new_roomlist_text = new_roomlist_text + "<li class=\"divider\"></li>" ;
 			}
 		}
-		new_sidebar_text = new_sidebar_text +
+		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>"
 		;
 	}
-	new_sidebar_text = new_sidebar_text + "</ul>";
-	document.getElementById("sidebar").innerHTML = new_sidebar_text ;
+	new_roomlist_text = new_roomlist_text + "</ul>";
+	document.getElementById("roomlist").innerHTML = new_roomlist_text ;
 }
 
+
 // Update the "banner" div with all relevant info.
 //
 function update_banner() {
 	detect_logged_in();
 	if (current_room) {
 		document.getElementById("ctdl_banner_title").innerHTML = current_room;
+		document.title = current_room;
 	}
 	else {
 		document.getElementById("ctdl_banner_title").innerHTML = serv_info.serv_humannode;
@@ -196,6 +205,51 @@ function gotoroom_2(data) {
 	total_messages = data.total_messages;
 	current_view = data.current_view;
 	default_view = data.default_view;
+	last_seen = data.last_seen;
 	update_banner();
-	render_room_view();
+	render_room_view(0, 9999999999);
+}
+
+
+// Goto next room with unread messages
+//
+function gotonext() {
+	if (march_list.length == 0) {
+		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 + " , " + march_list.length + " rooms remaining in march list");
+		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;
+			});
+			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);
+			});
+			march_list.push({name:"_BASEROOM_",known:true,hasnewmsgs:true,floor:0});
+			gotonext();
+		}
+	};
+	request.send();
+	request = null;
 }