diff --git a/static/js/stream_data.js b/static/js/stream_data.js index 040e52ca38..8faa21e646 100644 --- a/static/js/stream_data.js +++ b/static/js/stream_data.js @@ -25,14 +25,6 @@ exports.delete_sub = function (stream_name) { stream_info.del(stream_name); }; -exports.set_stream_info = function (new_stream_info) { - stream_info = new_stream_info; -}; - -exports.get_stream_info = function () { - return stream_info; -}; - exports.subscribed_subs = function () { return _.where(stream_info.values(), {subscribed: true}); }; diff --git a/static/js/tutorial.js b/static/js/tutorial.js index 8256dfc27f..8a7c1daa90 100644 --- a/static/js/tutorial.js +++ b/static/js/tutorial.js @@ -10,8 +10,8 @@ var current_popover_info; // We'll temporarily set stream colors for the streams we use in the demo // tutorial messages. -var real_stream_info; -var tutorial_stream_info = Dict.from({"engineering": {"color": "#76ce90"}}); +var real_default_color; +var tutorial_default_color = '#76ce90'; // Each message object contains the minimal information necessary for it to be // processed by our system for adding messages to your feed. @@ -333,7 +333,7 @@ function finale() { current_msg_list.clear(); // Force a check on new events before we re-render the message list. server_events.force_get_events(); - stream_data.set_stream_info(real_stream_info); + stream_color.default_color = real_default_color; util.show_first_run_message(); current_msg_list.rerender(); enable_event_handlers(); @@ -513,8 +513,8 @@ exports.start = function () { narrow.deactivate(); // Set temporarly colors for the streams used in the tutorial. - real_stream_info = stream_data.get_stream_info(); - stream_data.set_stream_info(tutorial_stream_info); + real_default_color = stream_color.default_color; + stream_color.default_color = tutorial_default_color; // Add the fake messages to the feed and get started. current_msg_list.add_and_rerender(fake_messages); disable_event_handlers(); diff --git a/zerver/tests/frontend/node/stream_data.js b/zerver/tests/frontend/node/stream_data.js index ce0a9805f3..55a68e7dc2 100644 --- a/zerver/tests/frontend/node/stream_data.js +++ b/zerver/tests/frontend/node/stream_data.js @@ -54,17 +54,6 @@ var stream_data = require('js/stream_data.js'); assert(!stream_data.is_subscribed('social')); }()); -(function test_get_and_set() { - stream_data.clear_subscriptions(); - stream_data.add_sub('Denmark', {name: 'Denmark', subscribed: true}); - assert.deepEqual(stream_data.subscribed_streams(), ['Denmark']); - var info = stream_data.get_stream_info(); - stream_data.clear_subscriptions(); - assert.deepEqual(stream_data.subscribed_streams(), []); - stream_data.set_stream_info(info); - assert.deepEqual(stream_data.subscribed_streams(), ['Denmark']); -}()); - (function test_subscribers() { stream_data.clear_subscriptions(); var sub = {name: 'Rome', subscribed: true};