mirror of https://github.com/zulip/zulip.git
js: Convert static/js/stream_sort.js to ES6 module.
Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
parent
87f2fe2cce
commit
2771434aad
|
@ -272,7 +272,6 @@
|
||||||
"stream_list": false,
|
"stream_list": false,
|
||||||
"stream_muting": false,
|
"stream_muting": false,
|
||||||
"stream_popover": false,
|
"stream_popover": false,
|
||||||
"stream_sort": false,
|
|
||||||
"stream_ui_updates": false,
|
"stream_ui_updates": false,
|
||||||
"StripeCheckout": false,
|
"StripeCheckout": false,
|
||||||
"submessage": false,
|
"submessage": false,
|
||||||
|
|
|
@ -608,7 +608,6 @@ run_test("unread_ops", () => {
|
||||||
|
|
||||||
const topic_list = set_global("topic_list", {});
|
const topic_list = set_global("topic_list", {});
|
||||||
|
|
||||||
zrequire("stream_sort");
|
|
||||||
const stream_list = zrequire("stream_list");
|
const stream_list = zrequire("stream_list");
|
||||||
|
|
||||||
const social_stream = {
|
const social_stream = {
|
||||||
|
|
|
@ -117,7 +117,6 @@ rewiremock.proxy(() => zrequire("notifications"), {
|
||||||
zrequire("pm_list");
|
zrequire("pm_list");
|
||||||
zrequire("list_cursor");
|
zrequire("list_cursor");
|
||||||
zrequire("keydown_util");
|
zrequire("keydown_util");
|
||||||
zrequire("stream_sort");
|
|
||||||
zrequire("stream_list");
|
zrequire("stream_list");
|
||||||
zrequire("topic_list");
|
zrequire("topic_list");
|
||||||
zrequire("topic_zoom");
|
zrequire("topic_zoom");
|
||||||
|
|
|
@ -39,7 +39,6 @@ import "../topic_list";
|
||||||
import "../pm_list_dom";
|
import "../pm_list_dom";
|
||||||
import "../pm_list";
|
import "../pm_list";
|
||||||
import "../recent_senders";
|
import "../recent_senders";
|
||||||
import "../stream_sort";
|
|
||||||
import "../topic_generator";
|
import "../topic_generator";
|
||||||
import "../top_left_corner";
|
import "../top_left_corner";
|
||||||
import "../stream_list";
|
import "../stream_list";
|
||||||
|
|
|
@ -138,7 +138,6 @@ declare let stream_events: any;
|
||||||
declare let stream_list: any;
|
declare let stream_list: any;
|
||||||
declare let stream_muting: any;
|
declare let stream_muting: any;
|
||||||
declare let stream_popover: any;
|
declare let stream_popover: any;
|
||||||
declare let stream_sort: any;
|
|
||||||
declare let stream_ui_updates: any;
|
declare let stream_ui_updates: any;
|
||||||
declare let submessage: any;
|
declare let submessage: any;
|
||||||
declare let subs: any;
|
declare let subs: any;
|
||||||
|
|
|
@ -5,6 +5,8 @@ const _ = require("lodash");
|
||||||
const render_stream_privacy = require("../templates/stream_privacy.hbs");
|
const render_stream_privacy = require("../templates/stream_privacy.hbs");
|
||||||
const render_stream_sidebar_row = require("../templates/stream_sidebar_row.hbs");
|
const render_stream_sidebar_row = require("../templates/stream_sidebar_row.hbs");
|
||||||
|
|
||||||
|
const stream_sort = require("./stream_sort");
|
||||||
|
|
||||||
let has_scrolled = false;
|
let has_scrolled = false;
|
||||||
|
|
||||||
exports.update_count_in_dom = function (unread_count_elem, count) {
|
exports.update_count_in_dom = function (unread_count_elem, count) {
|
||||||
|
|
|
@ -1,20 +1,18 @@
|
||||||
"use strict";
|
import * as util from "./util";
|
||||||
|
|
||||||
const util = require("./util");
|
|
||||||
|
|
||||||
let previous_pinned;
|
let previous_pinned;
|
||||||
let previous_normal;
|
let previous_normal;
|
||||||
let previous_dormant;
|
let previous_dormant;
|
||||||
let all_streams = [];
|
let all_streams = [];
|
||||||
|
|
||||||
exports.get_streams = function () {
|
export function get_streams() {
|
||||||
// Right now this is only used for testing, but we should
|
// Right now this is only used for testing, but we should
|
||||||
// use it for things like hotkeys that cycle through streams.
|
// use it for things like hotkeys that cycle through streams.
|
||||||
const sorted_streams = all_streams.map((stream_id) =>
|
const sorted_streams = all_streams.map((stream_id) =>
|
||||||
stream_data.maybe_get_stream_name(stream_id),
|
stream_data.maybe_get_stream_name(stream_id),
|
||||||
);
|
);
|
||||||
return sorted_streams;
|
return sorted_streams;
|
||||||
};
|
}
|
||||||
|
|
||||||
function compare_function(a, b) {
|
function compare_function(a, b) {
|
||||||
const stream_a = stream_data.get_sub_by_id(a);
|
const stream_a = stream_data.get_sub_by_id(a);
|
||||||
|
@ -46,7 +44,7 @@ function filter_streams_by_search(streams, search_term) {
|
||||||
return filtered_streams;
|
return filtered_streams;
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.sort_groups = function (streams, search_term) {
|
export function sort_groups(streams, search_term) {
|
||||||
if (streams.length === 0) {
|
if (streams.length === 0) {
|
||||||
return undefined;
|
return undefined;
|
||||||
}
|
}
|
||||||
|
@ -97,7 +95,7 @@ exports.sort_groups = function (streams, search_term) {
|
||||||
normal_streams,
|
normal_streams,
|
||||||
dormant_streams,
|
dormant_streams,
|
||||||
};
|
};
|
||||||
};
|
}
|
||||||
|
|
||||||
function maybe_get_stream_id(i) {
|
function maybe_get_stream_id(i) {
|
||||||
if (i < 0 || i >= all_streams.length) {
|
if (i < 0 || i >= all_streams.length) {
|
||||||
|
@ -107,11 +105,11 @@ function maybe_get_stream_id(i) {
|
||||||
return all_streams[i];
|
return all_streams[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
exports.first_stream_id = function () {
|
export function first_stream_id() {
|
||||||
return maybe_get_stream_id(0);
|
return maybe_get_stream_id(0);
|
||||||
};
|
}
|
||||||
|
|
||||||
exports.prev_stream_id = function (stream_id) {
|
export function prev_stream_id(stream_id) {
|
||||||
const i = all_streams.indexOf(stream_id);
|
const i = all_streams.indexOf(stream_id);
|
||||||
|
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
|
@ -119,9 +117,9 @@ exports.prev_stream_id = function (stream_id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return maybe_get_stream_id(i - 1);
|
return maybe_get_stream_id(i - 1);
|
||||||
};
|
}
|
||||||
|
|
||||||
exports.next_stream_id = function (stream_id) {
|
export function next_stream_id(stream_id) {
|
||||||
const i = all_streams.indexOf(stream_id);
|
const i = all_streams.indexOf(stream_id);
|
||||||
|
|
||||||
if (i < 0) {
|
if (i < 0) {
|
||||||
|
@ -129,6 +127,4 @@ exports.next_stream_id = function (stream_id) {
|
||||||
}
|
}
|
||||||
|
|
||||||
return maybe_get_stream_id(i + 1);
|
return maybe_get_stream_id(i + 1);
|
||||||
};
|
}
|
||||||
|
|
||||||
window.stream_sort = exports;
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const pm_conversations = require("./pm_conversations");
|
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) {
|
exports.next_topic = function (streams, get_topics, has_unread_messages, curr_stream, curr_topic) {
|
||||||
const curr_stream_index = streams.indexOf(curr_stream); // -1 if not found
|
const curr_stream_index = streams.indexOf(curr_stream); // -1 if not found
|
||||||
|
|
Loading…
Reference in New Issue