mirror of
https://github.com/zulip/zulip.git
synced 2025-11-13 10:26:28 +00:00
js: Standardize indentation of switch/case statements.
This gets my current draft eslint indentation configuration passing cleaning on static/js.
This commit is contained in:
@@ -8,38 +8,38 @@ exports.load_admin_section = function (name) {
|
|||||||
var section;
|
var section;
|
||||||
|
|
||||||
switch (name) {
|
switch (name) {
|
||||||
case 'organization-profile':
|
case 'organization-profile':
|
||||||
case 'organization-settings':
|
case 'organization-settings':
|
||||||
case 'organization-permissions':
|
case 'organization-permissions':
|
||||||
case 'auth-methods':
|
case 'auth-methods':
|
||||||
section = 'org';
|
section = 'org';
|
||||||
break;
|
break;
|
||||||
case 'emoji-settings':
|
case 'emoji-settings':
|
||||||
section = 'emoji';
|
section = 'emoji';
|
||||||
break;
|
break;
|
||||||
case 'bot-list-admin':
|
case 'bot-list-admin':
|
||||||
case 'user-list-admin':
|
case 'user-list-admin':
|
||||||
case 'deactivated-users-admin':
|
case 'deactivated-users-admin':
|
||||||
section = 'users';
|
section = 'users';
|
||||||
break;
|
break;
|
||||||
case 'default-streams-list':
|
case 'default-streams-list':
|
||||||
section = 'streams';
|
section = 'streams';
|
||||||
break;
|
break;
|
||||||
case 'filter-settings':
|
case 'filter-settings':
|
||||||
section = 'filters';
|
section = 'filters';
|
||||||
break;
|
break;
|
||||||
case 'invites-list-admin':
|
case 'invites-list-admin':
|
||||||
section = 'invites';
|
section = 'invites';
|
||||||
break;
|
break;
|
||||||
case 'user-groups-admin':
|
case 'user-groups-admin':
|
||||||
section = 'user-groups';
|
section = 'user-groups';
|
||||||
break;
|
break;
|
||||||
case 'profile-field-settings':
|
case 'profile-field-settings':
|
||||||
section = 'profile-fields';
|
section = 'profile-fields';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
blueslip.error('Unknown admin id ' + name);
|
blueslip.error('Unknown admin id ' + name);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (is_loaded.get(section)) {
|
if (is_loaded.get(section)) {
|
||||||
@@ -49,33 +49,33 @@ exports.load_admin_section = function (name) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (section) {
|
switch (section) {
|
||||||
case 'org':
|
case 'org':
|
||||||
settings_org.set_up();
|
settings_org.set_up();
|
||||||
break;
|
break;
|
||||||
case 'emoji':
|
case 'emoji':
|
||||||
settings_emoji.set_up();
|
settings_emoji.set_up();
|
||||||
break;
|
break;
|
||||||
case 'users':
|
case 'users':
|
||||||
settings_users.set_up();
|
settings_users.set_up();
|
||||||
break;
|
break;
|
||||||
case 'streams':
|
case 'streams':
|
||||||
settings_streams.set_up();
|
settings_streams.set_up();
|
||||||
break;
|
break;
|
||||||
case 'filters':
|
case 'filters':
|
||||||
settings_filters.set_up();
|
settings_filters.set_up();
|
||||||
break;
|
break;
|
||||||
case 'invites':
|
case 'invites':
|
||||||
settings_invites.set_up();
|
settings_invites.set_up();
|
||||||
break;
|
break;
|
||||||
case 'user-groups':
|
case 'user-groups':
|
||||||
settings_user_groups.set_up();
|
settings_user_groups.set_up();
|
||||||
break;
|
break;
|
||||||
case 'profile-fields':
|
case 'profile-fields':
|
||||||
settings_profile_fields.set_up();
|
settings_profile_fields.set_up();
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
blueslip.error('programming error for section ' + section);
|
blueslip.error('programming error for section ' + section);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
is_loaded.set(section, true);
|
is_loaded.set(section, true);
|
||||||
|
|||||||
@@ -32,12 +32,12 @@ var fade_config = {
|
|||||||
|
|
||||||
function level(status) {
|
function level(status) {
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case 'active':
|
case 'active':
|
||||||
return 1;
|
return 1;
|
||||||
case 'idle':
|
case 'idle':
|
||||||
return 2;
|
return 2;
|
||||||
default:
|
default:
|
||||||
return 3;
|
return 3;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -276,23 +276,23 @@ exports.tokenize_compose_str = function (s) {
|
|||||||
while (i > min_i) {
|
while (i > min_i) {
|
||||||
i -= 1;
|
i -= 1;
|
||||||
switch (s[i]) {
|
switch (s[i]) {
|
||||||
case '`':
|
case '`':
|
||||||
case '~':
|
case '~':
|
||||||
// Code block must start on a new line
|
// Code block must start on a new line
|
||||||
if (i === 2) {
|
if (i === 2) {
|
||||||
return s.slice(0);
|
return s.slice(0);
|
||||||
} else if (i > 2 && s[i-3] === "\n") {
|
} else if (i > 2 && s[i-3] === "\n") {
|
||||||
return s.slice(i-2);
|
return s.slice(i-2);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case '#':
|
case '#':
|
||||||
case '@':
|
case '@':
|
||||||
case ':':
|
case ':':
|
||||||
if (i === 0) {
|
if (i === 0) {
|
||||||
return s.slice(i);
|
return s.slice(i);
|
||||||
} else if (/[\s(){}\[\]]/.test(s[i-1])) {
|
} else if (/[\s(){}\[\]]/.test(s[i-1])) {
|
||||||
return s.slice(i);
|
return s.slice(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -137,9 +137,12 @@ exports.restore_draft = function (draft_id) {
|
|||||||
|
|
||||||
if (draft.type === "stream") {
|
if (draft.type === "stream") {
|
||||||
if (draft.stream !== "") {
|
if (draft.stream !== "") {
|
||||||
narrow.activate([{operator: "stream", operand: draft.stream},
|
narrow.activate(
|
||||||
{operator: "topic", operand: draft.subject}],
|
[
|
||||||
{trigger: "restore draft"});
|
{operator: "stream", operand: draft.stream},
|
||||||
|
{operator: "topic", operand: draft.subject},
|
||||||
|
],
|
||||||
|
{trigger: "restore draft"});
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
if (draft.private_message_recipient !== "") {
|
if (draft.private_message_recipient !== "") {
|
||||||
|
|||||||
@@ -496,18 +496,18 @@ exports.navigate = function (event_name) {
|
|||||||
} else if (!is_filter_focused) {
|
} else if (!is_filter_focused) {
|
||||||
var next_coord = {};
|
var next_coord = {};
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'down_arrow':
|
case 'down_arrow':
|
||||||
next_coord = get_next_emoji_coordinates(6);
|
next_coord = get_next_emoji_coordinates(6);
|
||||||
break;
|
break;
|
||||||
case 'up_arrow':
|
case 'up_arrow':
|
||||||
next_coord = get_next_emoji_coordinates(-6);
|
next_coord = get_next_emoji_coordinates(-6);
|
||||||
break;
|
break;
|
||||||
case 'left_arrow':
|
case 'left_arrow':
|
||||||
next_coord = get_next_emoji_coordinates(-1);
|
next_coord = get_next_emoji_coordinates(-1);
|
||||||
break;
|
break;
|
||||||
case 'right_arrow':
|
case 'right_arrow':
|
||||||
next_coord = get_next_emoji_coordinates(1);
|
next_coord = get_next_emoji_coordinates(1);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
return may_be_change_focused_emoji(next_coord.section, next_coord.index);
|
return may_be_change_focused_emoji(next_coord.section, next_coord.index);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -227,9 +227,9 @@ Filter.canonicalize_term = function (opts) {
|
|||||||
URI encoding to avoid problematic characters. */
|
URI encoding to avoid problematic characters. */
|
||||||
function encodeOperand(operand) {
|
function encodeOperand(operand) {
|
||||||
return operand.replace(/%/g, '%25')
|
return operand.replace(/%/g, '%25')
|
||||||
.replace(/\+/g, '%2B')
|
.replace(/\+/g, '%2B')
|
||||||
.replace(/ /g, '+')
|
.replace(/ /g, '+')
|
||||||
.replace(/"/g, '%22');
|
.replace(/"/g, '%22');
|
||||||
}
|
}
|
||||||
|
|
||||||
function decodeOperand(encoded, operator) {
|
function decodeOperand(encoded, operator) {
|
||||||
@@ -458,15 +458,15 @@ Filter.prototype = {
|
|||||||
update_email: function (user_id, new_email) {
|
update_email: function (user_id, new_email) {
|
||||||
_.each(this._operators, function (term) {
|
_.each(this._operators, function (term) {
|
||||||
switch (term.operator) {
|
switch (term.operator) {
|
||||||
case 'group-pm-with':
|
case 'group-pm-with':
|
||||||
case 'pm-with':
|
case 'pm-with':
|
||||||
case 'sender':
|
case 'sender':
|
||||||
case 'from':
|
case 'from':
|
||||||
term.operand = people.update_email_in_reply_to(
|
term.operand = people.update_email_in_reply_to(
|
||||||
term.operand,
|
term.operand,
|
||||||
user_id,
|
user_id,
|
||||||
new_email
|
new_email
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -422,27 +422,27 @@ exports.process_hotkey = function (e, hotkey) {
|
|||||||
|
|
||||||
// We handle the most complex keys in their own functions.
|
// We handle the most complex keys in their own functions.
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'escape':
|
case 'escape':
|
||||||
return exports.process_escape_key(e);
|
return exports.process_escape_key(e);
|
||||||
case 'enter':
|
case 'enter':
|
||||||
return exports.process_enter_key(e);
|
return exports.process_enter_key(e);
|
||||||
case 'tab':
|
case 'tab':
|
||||||
return exports.process_tab_key();
|
return exports.process_tab_key();
|
||||||
case 'shift_tab':
|
case 'shift_tab':
|
||||||
return exports.process_shift_tab_key();
|
return exports.process_shift_tab_key();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: break out specific handlers for up_arrow,
|
||||||
|
// down_arrow, and backspace
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
// TODO: break out specific handlers for up_arrow,
|
case 'up_arrow':
|
||||||
// down_arrow, and backspace
|
case 'down_arrow':
|
||||||
case 'up_arrow':
|
case 'backspace':
|
||||||
case 'down_arrow':
|
case 'delete':
|
||||||
case 'backspace':
|
if (overlays.drafts_open()) {
|
||||||
case 'delete':
|
drafts.drafts_handle_events(e, event_name);
|
||||||
if (overlays.drafts_open()) {
|
return true;
|
||||||
drafts.drafts_handle_events(e, event_name);
|
}
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hotkey.message_view_only && overlays.is_active()) {
|
if (hotkey.message_view_only && overlays.is_active()) {
|
||||||
@@ -469,12 +469,12 @@ exports.process_hotkey = function (e, hotkey) {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'up_arrow':
|
case 'up_arrow':
|
||||||
settings.handle_up_arrow(e);
|
settings.handle_up_arrow(e);
|
||||||
return true;
|
return true;
|
||||||
case 'down_arrow':
|
case 'down_arrow':
|
||||||
settings.handle_down_arrow(e);
|
settings.handle_down_arrow(e);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -601,55 +601,55 @@ exports.process_hotkey = function (e, hotkey) {
|
|||||||
|
|
||||||
// Shortcuts that don't require a message
|
// Shortcuts that don't require a message
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'compose': // 'c': compose
|
case 'compose': // 'c': compose
|
||||||
compose_actions.start('stream', {trigger: "compose_hotkey"});
|
compose_actions.start('stream', {trigger: "compose_hotkey"});
|
||||||
return true;
|
return true;
|
||||||
case 'compose_private_message':
|
case 'compose_private_message':
|
||||||
compose_actions.start('private', {trigger: "compose_hotkey"});
|
compose_actions.start('private', {trigger: "compose_hotkey"});
|
||||||
return true;
|
return true;
|
||||||
case 'narrow_private':
|
case 'narrow_private':
|
||||||
return do_narrow_action(function (target, opts) {
|
return do_narrow_action(function (target, opts) {
|
||||||
narrow.by('is', 'private', opts);
|
narrow.by('is', 'private', opts);
|
||||||
});
|
});
|
||||||
case 'query_streams':
|
case 'query_streams':
|
||||||
stream_list.initiate_search();
|
stream_list.initiate_search();
|
||||||
return true;
|
return true;
|
||||||
case 'query_users':
|
case 'query_users':
|
||||||
activity.initiate_search();
|
activity.initiate_search();
|
||||||
return true;
|
return true;
|
||||||
case 'search':
|
case 'search':
|
||||||
case 'search_with_k':
|
case 'search_with_k':
|
||||||
search.initiate_search();
|
search.initiate_search();
|
||||||
return true;
|
return true;
|
||||||
case 'gear_menu':
|
case 'gear_menu':
|
||||||
gear_menu.open();
|
gear_menu.open();
|
||||||
return true;
|
return true;
|
||||||
case 'show_shortcuts': // Show keyboard shortcuts page
|
case 'show_shortcuts': // Show keyboard shortcuts page
|
||||||
info_overlay.maybe_show_keyboard_shortcuts();
|
info_overlay.maybe_show_keyboard_shortcuts();
|
||||||
return true;
|
return true;
|
||||||
case 'stream_cycle_backward':
|
case 'stream_cycle_backward':
|
||||||
narrow.stream_cycle_backward();
|
narrow.stream_cycle_backward();
|
||||||
return true;
|
return true;
|
||||||
case 'stream_cycle_forward':
|
case 'stream_cycle_forward':
|
||||||
narrow.stream_cycle_forward();
|
narrow.stream_cycle_forward();
|
||||||
return true;
|
return true;
|
||||||
case 'n_key':
|
case 'n_key':
|
||||||
narrow.narrow_to_next_topic();
|
narrow.narrow_to_next_topic();
|
||||||
return true;
|
return true;
|
||||||
case 'p_key':
|
case 'p_key':
|
||||||
narrow.narrow_to_next_pm_string();
|
narrow.narrow_to_next_pm_string();
|
||||||
return true;
|
return true;
|
||||||
case 'open_drafts':
|
case 'open_drafts':
|
||||||
drafts.launch();
|
drafts.launch();
|
||||||
return true;
|
return true;
|
||||||
case 'reply_message': // 'r': respond to message
|
case 'reply_message': // 'r': respond to message
|
||||||
// Note that you can "enter" to respond to messages as well,
|
// Note that you can "enter" to respond to messages as well,
|
||||||
// but that is handled in process_enter_key().
|
// but that is handled in process_enter_key().
|
||||||
compose_actions.respond_to_message({trigger: 'hotkey'});
|
compose_actions.respond_to_message({trigger: 'hotkey'});
|
||||||
return true;
|
return true;
|
||||||
case 'C_deprecated':
|
case 'C_deprecated':
|
||||||
ui.maybe_show_deprecation_notice('C');
|
ui.maybe_show_deprecation_notice('C');
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (current_msg_list.empty()) {
|
if (current_msg_list.empty()) {
|
||||||
@@ -658,71 +658,71 @@ exports.process_hotkey = function (e, hotkey) {
|
|||||||
|
|
||||||
// Navigation shortcuts
|
// Navigation shortcuts
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'down_arrow':
|
case 'down_arrow':
|
||||||
case 'vim_down':
|
case 'vim_down':
|
||||||
navigate.down(true); // with_centering
|
navigate.down(true); // with_centering
|
||||||
return true;
|
return true;
|
||||||
case 'up_arrow':
|
case 'up_arrow':
|
||||||
case 'vim_up':
|
case 'vim_up':
|
||||||
navigate.up();
|
navigate.up();
|
||||||
return true;
|
return true;
|
||||||
case 'home':
|
case 'home':
|
||||||
navigate.to_home();
|
navigate.to_home();
|
||||||
return true;
|
return true;
|
||||||
case 'end':
|
case 'end':
|
||||||
case 'G_end':
|
case 'G_end':
|
||||||
navigate.to_end();
|
navigate.to_end();
|
||||||
return true;
|
return true;
|
||||||
case 'page_up':
|
case 'page_up':
|
||||||
case 'vim_page_up':
|
case 'vim_page_up':
|
||||||
case 'shift_spacebar':
|
case 'shift_spacebar':
|
||||||
navigate.page_up();
|
navigate.page_up();
|
||||||
return true;
|
return true;
|
||||||
case 'page_down':
|
case 'page_down':
|
||||||
case 'vim_page_down':
|
case 'vim_page_down':
|
||||||
case 'spacebar':
|
case 'spacebar':
|
||||||
navigate.page_down();
|
navigate.page_down();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
var msg = current_msg_list.selected_message();
|
var msg = current_msg_list.selected_message();
|
||||||
// Shortcuts that operate on a message
|
// Shortcuts that operate on a message
|
||||||
switch (event_name) {
|
switch (event_name) {
|
||||||
case 'message_actions':
|
case 'message_actions':
|
||||||
return popovers.open_message_menu(msg);
|
return popovers.open_message_menu(msg);
|
||||||
case 'star_message':
|
case 'star_message':
|
||||||
return message_flags.toggle_starred(msg);
|
return message_flags.toggle_starred(msg);
|
||||||
case 'narrow_by_recipient':
|
case 'narrow_by_recipient':
|
||||||
return do_narrow_action(narrow.by_recipient);
|
return do_narrow_action(narrow.by_recipient);
|
||||||
case 'narrow_by_subject':
|
case 'narrow_by_subject':
|
||||||
return do_narrow_action(narrow.by_subject);
|
return do_narrow_action(narrow.by_subject);
|
||||||
case 'respond_to_author': // 'R': respond to author
|
case 'respond_to_author': // 'R': respond to author
|
||||||
compose_actions.respond_to_message({reply_type: "personal", trigger: 'hotkey pm'});
|
compose_actions.respond_to_message({reply_type: "personal", trigger: 'hotkey pm'});
|
||||||
return true;
|
return true;
|
||||||
case 'compose_reply_with_mention': // '@': respond to message with mention to author
|
case 'compose_reply_with_mention': // '@': respond to message with mention to author
|
||||||
compose_actions.reply_with_mention({trigger: 'hotkey'});
|
compose_actions.reply_with_mention({trigger: 'hotkey'});
|
||||||
return true;
|
return true;
|
||||||
case 'show_lightbox':
|
case 'show_lightbox':
|
||||||
lightbox.show_from_selected_message();
|
lightbox.show_from_selected_message();
|
||||||
return true;
|
return true;
|
||||||
case 'show_sender_info':
|
case 'show_sender_info':
|
||||||
popovers.show_sender_info();
|
popovers.show_sender_info();
|
||||||
return true;
|
return true;
|
||||||
case 'toggle_reactions_popover': // ':': open reactions to message
|
case 'toggle_reactions_popover': // ':': open reactions to message
|
||||||
reactions.open_reactions_popover();
|
reactions.open_reactions_popover();
|
||||||
return true;
|
return true;
|
||||||
case 'thumbs_up_emoji': // '+': reacts with thumbs up emoji on selected message
|
case 'thumbs_up_emoji': // '+': reacts with thumbs up emoji on selected message
|
||||||
reactions.toggle_emoji_reaction(msg.id, "thumbs_up");
|
reactions.toggle_emoji_reaction(msg.id, "thumbs_up");
|
||||||
return true;
|
return true;
|
||||||
case 'toggle_mute':
|
case 'toggle_mute':
|
||||||
muting_ui.toggle_mute(msg);
|
muting_ui.toggle_mute(msg);
|
||||||
return true;
|
return true;
|
||||||
case 'toggle_message_collapse':
|
case 'toggle_message_collapse':
|
||||||
condense.toggle_collapse(msg);
|
condense.toggle_collapse(msg);
|
||||||
return true;
|
return true;
|
||||||
case 'compose_quote_reply': // > : respond to selected message with quote
|
case 'compose_quote_reply': // > : respond to selected message with quote
|
||||||
compose_actions.quote_and_reply({trigger: 'hotkey'});
|
compose_actions.quote_and_reply({trigger: 'hotkey'});
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -94,52 +94,52 @@ function place_popover(hotspot) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
switch (orientation) {
|
switch (orientation) {
|
||||||
case TOP:
|
case TOP:
|
||||||
popover_offset = {
|
popover_offset = {
|
||||||
top: -(popover_height + arrow_offset),
|
top: -(popover_height + arrow_offset),
|
||||||
left: (el_width / 2) - (popover_width / 2),
|
left: (el_width / 2) - (popover_width / 2),
|
||||||
};
|
};
|
||||||
arrow_placement = 'bottom';
|
arrow_placement = 'bottom';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case LEFT:
|
case LEFT:
|
||||||
popover_offset = {
|
popover_offset = {
|
||||||
top: (el_height / 2) - (popover_height / 2),
|
top: (el_height / 2) - (popover_height / 2),
|
||||||
left: -(popover_width + arrow_offset),
|
left: -(popover_width + arrow_offset),
|
||||||
};
|
};
|
||||||
arrow_placement = 'right';
|
arrow_placement = 'right';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case BOTTOM:
|
case BOTTOM:
|
||||||
popover_offset = {
|
popover_offset = {
|
||||||
top: el_height + arrow_offset,
|
top: el_height + arrow_offset,
|
||||||
left: (el_width / 2) - (popover_width / 2),
|
left: (el_width / 2) - (popover_width / 2),
|
||||||
};
|
};
|
||||||
arrow_placement = 'top';
|
arrow_placement = 'top';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case RIGHT:
|
case RIGHT:
|
||||||
popover_offset = {
|
popover_offset = {
|
||||||
top: (el_height / 2) - (popover_height / 2),
|
top: (el_height / 2) - (popover_height / 2),
|
||||||
left: el_width + arrow_offset,
|
left: el_width + arrow_offset,
|
||||||
};
|
};
|
||||||
arrow_placement = 'left';
|
arrow_placement = 'left';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case VIEWPORT_CENTER:
|
case VIEWPORT_CENTER:
|
||||||
popover_offset = {
|
popover_offset = {
|
||||||
top: el_height / 2,
|
top: el_height / 2,
|
||||||
left: el_width / 2,
|
left: el_width / 2,
|
||||||
};
|
};
|
||||||
arrow_placement = '';
|
arrow_placement = '';
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
blueslip.error(
|
blueslip.error(
|
||||||
'Invalid popover placement value for hotspot \'' +
|
'Invalid popover placement value for hotspot \'' +
|
||||||
hotspot.name + '\''
|
hotspot.name + '\''
|
||||||
);
|
);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// position arrow
|
// position arrow
|
||||||
|
|||||||
@@ -147,7 +147,7 @@ exports.add_message_metadata = function (message) {
|
|||||||
case 'private':
|
case 'private':
|
||||||
message.is_private = true;
|
message.is_private = true;
|
||||||
message.reply_to = util.normalize_recipients(
|
message.reply_to = util.normalize_recipients(
|
||||||
exports.get_pm_emails(message));
|
exports.get_pm_emails(message));
|
||||||
message.display_reply_to = exports.get_pm_full_names(message);
|
message.display_reply_to = exports.get_pm_full_names(message);
|
||||||
message.pm_with_url = people.pm_with_url(message);
|
message.pm_with_url = people.pm_with_url(message);
|
||||||
message.to_user_ids = people.pm_reply_user_string(message);
|
message.to_user_ids = people.pm_reply_user_string(message);
|
||||||
|
|||||||
@@ -269,48 +269,48 @@ function render(next_state) {
|
|||||||
|
|
||||||
function dispatch(action, payload) {
|
function dispatch(action, payload) {
|
||||||
switch (action) {
|
switch (action) {
|
||||||
case 'CHANGE_CATEGORY':
|
case 'CHANGE_CATEGORY':
|
||||||
render(Object.assign({}, state, {
|
render(Object.assign({}, state, {
|
||||||
category: payload.category,
|
category: payload.category,
|
||||||
}));
|
}));
|
||||||
update_path();
|
update_path();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'SHOW_INTEGRATION':
|
case 'SHOW_INTEGRATION':
|
||||||
render(Object.assign({}, state, {
|
render(Object.assign({}, state, {
|
||||||
integration: payload.integration,
|
integration: payload.integration,
|
||||||
}));
|
}));
|
||||||
update_path();
|
update_path();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'HIDE_INTEGRATION':
|
case 'HIDE_INTEGRATION':
|
||||||
render(Object.assign({}, state, {
|
render(Object.assign({}, state, {
|
||||||
integration: null,
|
integration: null,
|
||||||
}));
|
}));
|
||||||
update_path();
|
update_path();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'SHOW_CATEGORY':
|
case 'SHOW_CATEGORY':
|
||||||
render(Object.assign({}, state, {
|
render(Object.assign({}, state, {
|
||||||
integration: null,
|
integration: null,
|
||||||
category: payload.category,
|
category: payload.category,
|
||||||
}));
|
}));
|
||||||
update_path();
|
update_path();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'UPDATE_QUERY':
|
case 'UPDATE_QUERY':
|
||||||
render(Object.assign({}, state, {
|
render(Object.assign({}, state, {
|
||||||
query: payload.query,
|
query: payload.query,
|
||||||
}));
|
}));
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case 'LOAD_PATH':
|
case 'LOAD_PATH':
|
||||||
render(get_state_from_path());
|
render(get_state_from_path());
|
||||||
break;
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
blueslip.error('Invalid action dispatched on /integrations.');
|
blueslip.error('Invalid action dispatched on /integrations.');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,9 +4,11 @@ var exports = {};
|
|||||||
exports.view = {}; // function namespace
|
exports.view = {}; // function namespace
|
||||||
|
|
||||||
exports.get_local_reaction_id = function (reaction_info) {
|
exports.get_local_reaction_id = function (reaction_info) {
|
||||||
return [reaction_info.reaction_type,
|
return [
|
||||||
reaction_info.emoji_name,
|
reaction_info.reaction_type,
|
||||||
reaction_info.emoji_code].join(',');
|
reaction_info.emoji_name,
|
||||||
|
reaction_info.emoji_code,
|
||||||
|
].join(',');
|
||||||
};
|
};
|
||||||
|
|
||||||
exports.get_reaction_info = function (reaction_id) {
|
exports.get_reaction_info = function (reaction_id) {
|
||||||
|
|||||||
@@ -35,11 +35,12 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case 'restart':
|
case 'restart':
|
||||||
var reload_options = {save_pointer: true,
|
var reload_options = {
|
||||||
save_narrow: true,
|
save_pointer: true,
|
||||||
save_compose: true,
|
save_narrow: true,
|
||||||
message: "The application has been updated; reloading!",
|
save_compose: true,
|
||||||
};
|
message: "The application has been updated; reloading!",
|
||||||
|
};
|
||||||
if (event.immediate) {
|
if (event.immediate) {
|
||||||
reload_options.immediate = true;
|
reload_options.immediate = true;
|
||||||
}
|
}
|
||||||
@@ -92,8 +93,8 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
|
|||||||
settings_org.sync_realm_settings(event.property);
|
settings_org.sync_realm_settings(event.property);
|
||||||
if (event.property === 'create_stream_by_admins_only') {
|
if (event.property === 'create_stream_by_admins_only') {
|
||||||
if (!page_params.is_admin) {
|
if (!page_params.is_admin) {
|
||||||
page_params.can_create_streams = (!page_params.
|
page_params.can_create_streams = (
|
||||||
realm_create_stream_by_admins_only);
|
!page_params.realm_create_stream_by_admins_only);
|
||||||
}
|
}
|
||||||
} else if (event.property === 'notifications_stream_id') {
|
} else if (event.property === 'notifications_stream_id') {
|
||||||
settings_org.render_notifications_stream_ui(
|
settings_org.render_notifications_stream_ui(
|
||||||
|
|||||||
@@ -30,9 +30,20 @@ function floor_to_local_week(date) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function format_date(date, include_hour) {
|
function format_date(date, include_hour) {
|
||||||
var months = [i18n.t('January'), i18n.t('February'), i18n.t('March'), i18n.t('April'), i18n.t('May'), i18n.t('June'),
|
var months = [
|
||||||
i18n.t('July'), i18n.t('August'), i18n.t('September'), i18n.t('October'), i18n.t('November'),
|
i18n.t('January'),
|
||||||
i18n.t('December')];
|
i18n.t('February'),
|
||||||
|
i18n.t('March'),
|
||||||
|
i18n.t('April'),
|
||||||
|
i18n.t('May'),
|
||||||
|
i18n.t('June'),
|
||||||
|
i18n.t('July'),
|
||||||
|
i18n.t('August'),
|
||||||
|
i18n.t('September'),
|
||||||
|
i18n.t('October'),
|
||||||
|
i18n.t('November'),
|
||||||
|
i18n.t('December'),
|
||||||
|
];
|
||||||
var month_str = months[date.getMonth()];
|
var month_str = months[date.getMonth()];
|
||||||
var year = date.getFullYear();
|
var year = date.getFullYear();
|
||||||
var day = date.getDate();
|
var day = date.getDate();
|
||||||
@@ -135,10 +146,11 @@ function populate_messages_sent_over_time(data) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function make_rangeselector(x, y, button1, button2) {
|
function make_rangeselector(x, y, button1, button2) {
|
||||||
return { x: x, y: y,
|
return {x: x, y: y,
|
||||||
buttons: [$.extend({stepmode: 'backward'}, button1),
|
buttons: [
|
||||||
$.extend({stepmode: 'backward'}, button2),
|
$.extend({stepmode: 'backward'}, button1),
|
||||||
{step: 'all', label: 'All time'}] };
|
$.extend({stepmode: 'backward'}, button2),
|
||||||
|
{step: 'all', label: 'All time'}]};
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is also the cumulative rangeselector
|
// This is also the cumulative rangeselector
|
||||||
@@ -247,7 +259,7 @@ function populate_messages_sent_over_time(data) {
|
|||||||
return new Date(timestamp*1000);
|
return new Date(timestamp*1000);
|
||||||
});
|
});
|
||||||
values = {human: partial_sums(data.realm.human), bot: partial_sums(data.realm.bot),
|
values = {human: partial_sums(data.realm.human), bot: partial_sums(data.realm.bot),
|
||||||
me: partial_sums(data.user.human)};
|
me: partial_sums(data.user.human)};
|
||||||
date_formatter = function (date) {
|
date_formatter = function (date) {
|
||||||
return format_date(date, true);
|
return format_date(date, true);
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -220,8 +220,10 @@ exports.stringify_time = function (time) {
|
|||||||
// this is for rendering absolute time based off the preferences for twenty-four
|
// this is for rendering absolute time based off the preferences for twenty-four
|
||||||
// hour time in the format of "%mmm %d, %h:%m %p".
|
// hour time in the format of "%mmm %d, %h:%m %p".
|
||||||
exports.absolute_time = (function () {
|
exports.absolute_time = (function () {
|
||||||
var MONTHS = ["Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
var MONTHS = [
|
||||||
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
|
"Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||||
|
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
|
||||||
|
];
|
||||||
|
|
||||||
var fmt_time = function (date, H_24) {
|
var fmt_time = function (date, H_24) {
|
||||||
var payload = {
|
var payload = {
|
||||||
|
|||||||
Reference in New Issue
Block a user