paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move small_avatar_url() to people.js.

Browse Source
This commit is contained in:
Steve Howell
2017-01-21 11:29:39 -08:00
committed by Tim Abbott
parent 4eb1a8f07d
commit e7e2e388c5
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/message_list_view.js
View File

@@ -12,7 +12,7 @@ set_global('page_params', {
}); });
set_global('home_msg_list', null); set_global('home_msg_list', null);
set_global('feature_flags', {twenty_four_hour_time: false}); set_global('feature_flags', {twenty_four_hour_time: false});
set_global('ui', {small_avatar_url: function () { return ''; }}); set_global('people', {small_avatar_url: function () { return ''; }});
set_global('notifications', {speaking_at_me: function () {}}); set_global('notifications', {speaking_at_me: function () {}});
set_global('unread', {message_unread: function () {}}); set_global('unread', {message_unread: function () {}});
// timerender calls setInterval when imported // timerender calls setInterval when imported

2
static/js/message_list_view.js
View File

@@ -223,7 +223,7 @@ MessageListView.prototype = {
self._add_msg_timestring(message_container); self._add_msg_timestring(message_container);
message_container.small_avatar_url = ui.small_avatar_url(message_container.msg); message_container.small_avatar_url = people.small_avatar_url(message_container.msg);
if (message_container.msg.stream !== undefined) { if (message_container.msg.stream !== undefined) {
message_container.background_color = message_container.background_color =
stream_data.get_color(message_container.msg.stream); stream_data.get_color(message_container.msg.stream);

6
static/js/notifications.js
View File

@@ -221,7 +221,7 @@ exports.window_has_focus = function () {
function in_browser_notify(message, title, content, raw_operators, opts) { function in_browser_notify(message, title, content, raw_operators, opts) {
var notification_html = $(templates.render('notification', { var notification_html = $(templates.render('notification', {
gravatar_url: ui.small_avatar_url(message), gravatar_url: people.small_avatar_url(message),
title: title, title: title,
content: content, content: content,
message_id: message.id, message_id: message.id,
@@ -340,7 +340,7 @@ function process_notification(notification) {
} }
if (window.bridge === undefined && notification.webkit_notify === true) { if (window.bridge === undefined && notification.webkit_notify === true) {
var icon_url = ui.small_avatar_url(message); var icon_url = people.small_avatar_url(message);
notice_memory[key] = { notice_memory[key] = {
obj: notifications_api.createNotification( obj: notifications_api.createNotification(
icon_url, title, content, message.id), icon_url, title, content, message.id),
@@ -364,7 +364,7 @@ function process_notification(notification) {
if (perm === 'granted') { if (perm === 'granted') {
notification_object = new Notification(title, { notification_object = new Notification(title, {
body: content, body: content,
iconUrl: ui.small_avatar_url(message), iconUrl: people.small_avatar_url(message),
tag: message.id, tag: message.id,
}); });
} else { } else {

18
static/js/people.js
View File

@@ -120,6 +120,24 @@ exports.slug_to_emails = function (slug) {
} }
}; };
exports.small_avatar_url = function (message) {
// Try to call this function in all places where we need 25px
// avatar images, so that the browser can help
// us avoid unnecessary network trips. (For user-uploaded avatars,
// the s=25 parameter is essentially ignored, but it's harmless.)
//
// We actually request these at s=50, so that we look better
// on retina displays.
if (message.avatar_url) {
var url = message.avatar_url + "&s=50";
if (message.sent_by_me) {
url += "&stamp=" + settings.avatar_stamp;
}
return url;
}
return "";
};
exports.realm_get = function realm_get(email) { exports.realm_get = function realm_get(email) {
return realm_people_dict.get(email); return realm_people_dict.get(email);
}; };

18
static/js/ui.js
View File

@@ -259,24 +259,6 @@ exports.show_failed_message_success = function (message_id) {
}); });
}; };
exports.small_avatar_url = function (message) {
// Try to call this function in all places where we need 25px
// avatar images, so that the browser can help
// us avoid unnecessary network trips. (For user-uploaded avatars,
// the s=25 parameter is essentially ignored, but it's harmless.)
//
// We actually request these at s=50, so that we look better
// on retina displays.
if (message.avatar_url) {
var url = message.avatar_url + "&s=50";
if (message.sent_by_me) {
url += "&stamp=" + settings.avatar_stamp;
}
return url;
}
return "";
};
exports.lightbox = function (data) { exports.lightbox = function (data) {
switch (data.type) { switch (data.type) {
case "photo": case "photo":