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