X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit-ng%2Fstatic%2Fjs%2Fmain.js;h=943d7519fdddc5f987664f3e39015de4fae73c83;hb=c2f152e55bce8c5df5e6b57953e602f6cd25d636;hp=0170a987aba037465982c312e67a0320ecb8ad7e;hpb=b189e3c20289655e602210cb8e250bfd98d9dd47;p=citadel.git diff --git a/webcit-ng/static/js/main.js b/webcit-ng/static/js/main.js index 0170a987a..943d7519f 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. @@ -20,6 +20,7 @@ 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 @@ -33,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)]; } @@ -49,35 +49,35 @@ function randomString(length) { // string escape for html display // function escapeHTML(text) { - 'use strict'; - return text.replace(/[\"&<>]/g, function (a) { - return { - '"': '"', - '&': '&', - '<': '<', - '>': '>' - }[a]; - }); + 'use strict'; + return text.replace(/[\"&<>]/g, function (a) { + return { + '"': '"', + '&': '&', + '<': '<', + '>': '>' + }[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 ; + }); } @@ -95,6 +95,7 @@ function ctdl_startup() { request = null; } + // Continuation of ctdl_startup() after serv_info is retrieved // function ctdl_startup_2(data) { @@ -111,6 +112,7 @@ function ctdl_startup_2(data) { display_room_list(); } + // Display a room list in the main div. // function display_room_list() { @@ -127,6 +129,7 @@ function display_room_list() { request = null; } + // Renderer for display_room_list() // function display_room_list_renderer(data) { @@ -150,8 +153,10 @@ function display_room_list_renderer(data) { } new_roomlist_text = new_roomlist_text + "