From ebbbc4d8c2ac87528467e50ad5e05cebe8f2e5ac Mon Sep 17 00:00:00 2001 From: Keegan McAllister Date: Tue, 19 Feb 2013 14:13:50 -0500 Subject: [PATCH] Apply stream bar color class to the compose window as well (imported from commit 3c3f3d1073a95ceff74a571f1b2c985a7b820c8e) --- zephyr/static/js/compose.js | 5 ++++- zephyr/static/js/subs.js | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/zephyr/static/js/compose.js b/zephyr/static/js/compose.js index 3e4d176e15..44436edbfe 100644 --- a/zephyr/static/js/compose.js +++ b/zephyr/static/js/compose.js @@ -59,7 +59,10 @@ function show(tabname, focus_area) { // have that color be reflected here too.) exports.decorate_stream_bar = function (stream_name) { var color = subs.get_color(stream_name); - $("#stream-message .message_header_stream").css("background-color", color); + $("#stream-message .message_header_stream") + .css('background-color', color) + .removeClass(subs.color_classes) + .addClass(subs.get_color_class(color)); }; exports.start = function (msg_type, opts) { diff --git a/zephyr/static/js/subs.js b/zephyr/static/js/subs.js index 39247278c4..8acaac5d28 100644 --- a/zephyr/static/js/subs.js +++ b/zephyr/static/js/subs.js @@ -12,7 +12,7 @@ var default_color = "#c2c2c2"; var next_sub_id = 0; // Classes which could be returned by get_color_class. -var color_classes = 'dark_background'; +exports.color_classes = 'dark_background'; exports.subscribed_streams = function () { // TODO: Object.keys() compatibility @@ -39,7 +39,7 @@ function update_table_stream_color(table, stream_name, color) { var color_class = exports.get_color_class(color); function fixup(elem) { elem.css("background-color", color) - .removeClass(color_classes) + .removeClass(exports.color_classes) .addClass(color_class); }