paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-28 10:33:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using /json/streams on the client.

Browse Source 
We no longer need to fetch streams from the server when
we render the settings page.

The name populate_and_fill() may not be a great name any
more.
This commit is contained in:
Steve Howell
2016-10-25 12:50:14 -07:00
committed by Tim Abbott
parent 10bc093375
commit 15602ee6bb
1 changed files with 5 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
static/js/subs.js
View File

@@ -516,11 +516,8 @@ function actually_filter_streams() {
var filter_streams = _.throttle(actually_filter_streams, 50); var filter_streams = _.throttle(actually_filter_streams, 50);
exports.setup_page = function () { exports.setup_page = function () {
loading.make_indicator($('#subs_page_loading_indicator'));
function _populate_and_fill(public_streams) {
// TODO: stop fetching public_streams
function _populate_and_fill() {
var sub_rows = stream_data.get_streams_for_settings_page(); var sub_rows = stream_data.get_streams_for_settings_page();
$('#subscriptions_table').empty(); $('#subscriptions_table').empty();
@@ -538,34 +535,19 @@ exports.setup_page = function () {
add_email_hint(row, email_address_hint_content); add_email_hint(row, email_address_hint_content);
}); });
loading.destroy_indicator($('#subs_page_loading_indicator'));
$("#create_or_filter_stream_row input[type='text']").on("input", filter_streams); $("#create_or_filter_stream_row input[type='text']").on("input", filter_streams);
$(document).trigger($.Event('subs_page_loaded.zulip')); $(document).trigger($.Event('subs_page_loaded.zulip'));
} }
function populate_and_fill(public_streams) { function populate_and_fill() {
i18n.ensure_i18n(function () { i18n.ensure_i18n(function () {
_populate_and_fill(public_streams); _populate_and_fill();
}); });
} }
function failed_listing(xhr, error) { populate_and_fill();
loading.destroy_indicator($('#subs_page_loading_indicator'));
ui.report_error(i18n.t("Error listing streams or subscriptions"), xhr,
$("#subscriptions-status"), 'subscriptions-status');
}
if (should_list_all_streams()) { if (!should_list_all_streams()) {
var req = channel.get({
url: '/json/streams',
data: {"include_subscribed": false},
idempotent: true,
timeout: 10*1000,
success: populate_and_fill,
error: failed_listing
});
} else {
populate_and_fill({streams: []});
$('#create_stream_button').val(i18n.t("Subscribe")); $('#create_stream_button').val(i18n.t("Subscribe"));
} }
}; };