Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

js: Convert static/js/topic_generator.js to ES6 module. 

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2021-02-10 07:50:28 -08:00 committed by Tim Abbott
parent 2771434aad
commit 07e6de1cd9
5 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.eslintrc.json
View File

@ -281,7 +281,6 @@
"timerender": false,
"todo_widget": false,
"top_left_corner": false,
"topic_generator": false,
"topic_list": false,
"topic_zoom": false,
"transmit": false,

1
static/js/bundles/app.js
View File

@ -39,7 +39,6 @@ import "../topic_list";
import "../pm_list_dom";
import "../pm_list";
import "../recent_senders";
import "../topic_generator";
import "../top_left_corner";
import "../stream_list";
import "../topic_zoom";

1
static/js/global.d.ts vendored
View File

@ -146,7 +146,6 @@ declare let templates: any;
declare let timerender: any;
declare let todo_widget: any;
declare let stream_topic_history: any;
declare let topic_generator: any;
declare let topic_list: any;
declare let topic_zoom: any;
declare let top_left_corner: any;

1
static/js/narrow.js
View File

@ -1,6 +1,7 @@
"use strict";
const people = require("./people");
const topic_generator = require("./topic_generator");
const util = require("./util");
let unnarrow_times;

36
static/js/topic_generator.js
View File

@ -1,9 +1,7 @@
"use strict";
import * as pm_conversations from "./pm_conversations";
import * as stream_sort from "./stream_sort";
const pm_conversations = require("./pm_conversations");
const stream_sort = require("./stream_sort");
exports.next_topic = function (streams, get_topics, has_unread_messages, curr_stream, curr_topic) {
export function next_topic(streams, get_topics, has_unread_messages, curr_stream, curr_topic) {
const curr_stream_index = streams.indexOf(curr_stream); // -1 if not found
if (curr_stream_index >= 0) {
@ -45,9 +43,9 @@ exports.next_topic = function (streams, get_topics, has_unread_messages, curr_st
}
return undefined;
};
}
exports.get_next_topic = function (curr_stream, curr_topic) {
export function get_next_topic(curr_stream, curr_topic) {
let my_streams = stream_sort.get_streams();
my_streams = my_streams.filter((stream_name) => {
@ -74,16 +72,10 @@ exports.get_next_topic = function (curr_stream, curr_topic) {
return unread.topic_has_any_unread(stream_id, topic);
}
return exports.next_topic(
my_streams,
get_unmuted_topics,
has_unread_messages,
curr_stream,
curr_topic,
);
};
return next_topic(my_streams, get_unmuted_topics, has_unread_messages, curr_stream, curr_topic);
}
exports.get_next_unread_pm_string = function (curr_pm) {
export function get_next_unread_pm_string(curr_pm) {
const my_pm_strings = pm_conversations.recent.get_strings();
const curr_pm_index = my_pm_strings.indexOf(curr_pm); // -1 if not found
@ -100,9 +92,9 @@ exports.get_next_unread_pm_string = function (curr_pm) {
}
return undefined;
};
}
exports.get_next_stream = function (curr_stream) {
export function get_next_stream(curr_stream) {
const my_streams = stream_sort.get_streams();
const curr_stream_index = my_streams.indexOf(curr_stream);
return my_streams[
@ -110,12 +102,10 @@ exports.get_next_stream = function (curr_stream) {
? 0
: curr_stream_index + 1
];
};
}
exports.get_prev_stream = function (curr_stream) {
export function get_prev_stream(curr_stream) {
const my_streams = stream_sort.get_streams();
const curr_stream_index = my_streams.indexOf(curr_stream);
return my_streams[curr_stream_index <= 0 ? my_streams.length - 1 : curr_stream_index - 1];
};
window.topic_generator = exports;
}