Indents are 8 positions, NEVER 4, and are comprised of tabs, not spaces. Anyone...

[citadel.git] / webcit-ng / static / js / main.js

diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js
index 5f02ec0c3e2a02479eb4a17d8e6cbbfbc26115dd..f0b0e90a4484b300f55c22cfe8b4abbb1cf531b6 100644 (file)
--- 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,20 +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();
-               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
        }
        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);
        }
 }
@@ -236,7 +234,20 @@ function load_new_march_list() {
        request.onreadystatechange = function() {
                if ((this.readyState === 4) && ((this.status / 100) == 2)) {
                        march_list = (JSON.parse(this.responseText));
-                       gotonext();             // yes , we recurse right back  FIXME sort and filter this data
+                       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();