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

Refactor perfect-scrollbar: Call ui methods in emoji_picker.js.

Browse Source
This commit is contained in:
gooca
2018-03-12 02:01:11 +00:00
committed by Tim Abbott
parent 0281079a39
commit ba05ac5c77
2 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
static/js/emoji_picker.js
View File

@@ -182,15 +182,6 @@ var generate_emoji_picker_content = function (id) {
}); });
}; };
function add_scrollbar(element) {
$(element).perfectScrollbar({
suppressScrollX: true,
useKeyboard: false,
// Picked so that each mousewheel bump moves 1 emoji down.
wheelSpeed: 0.68,
});
}
function refill_section_head_offsets(popover) { function refill_section_head_offsets(popover) {
section_head_offsets = []; section_head_offsets = [];
popover.find('.emoji-popover-subheading').each(function () { popover.find('.emoji-popover-subheading').each(function () {
@@ -209,8 +200,8 @@ exports.hide_emoji_popover = function () {
$('.has_popover').removeClass('has_popover has_emoji_popover'); $('.has_popover').removeClass('has_popover has_emoji_popover');
if (exports.reactions_popped()) { if (exports.reactions_popped()) {
var orig_title = current_message_emoji_popover_elem.data("original-title"); var orig_title = current_message_emoji_popover_elem.data("original-title");
$(".emoji-popover-emoji-map").perfectScrollbar("destroy"); ui.destroy_scrollbar($(".emoji-popover-emoji-map"));
$(".emoji-search-results-container").perfectScrollbar("destroy"); ui.destroy_scrollbar($(".emoji-search-results-container"));
current_message_emoji_popover_elem.popover("destroy"); current_message_emoji_popover_elem.popover("destroy");
current_message_emoji_popover_elem.prop("title", orig_title); current_message_emoji_popover_elem.prop("title", orig_title);
current_message_emoji_popover_elem.removeClass("reaction_button_visible"); current_message_emoji_popover_elem.removeClass("reaction_button_visible");
@@ -261,7 +252,7 @@ function filter_emojis() {
message_id: message_id, message_id: message_id,
}); });
$('.emoji-search-results').html(search_results_rendered); $('.emoji-search-results').html(search_results_rendered);
$(".emoji-search-results-container").perfectScrollbar("update"); ui.update_scrollbar($(".emoji-search-results-container"));
if (!search_results_visible) { if (!search_results_visible) {
show_search_results(); show_search_results();
} }
@@ -626,8 +617,8 @@ exports.render_emoji_popover = function (elt, id) {
elt.popover("show"); elt.popover("show");
elt.prop("title", i18n.t("Add emoji reaction (:)")); elt.prop("title", i18n.t("Add emoji reaction (:)"));
$('.emoji-popover-filter').focus(); $('.emoji-popover-filter').focus();
add_scrollbar($(".emoji-popover-emoji-map")); ui.set_up_scrollbar($(".emoji-popover-emoji-map"));
add_scrollbar($(".emoji-search-results-container")); ui.set_up_scrollbar($(".emoji-search-results-container"));
current_message_emoji_popover_elem = elt; current_message_emoji_popover_elem = elt;
emoji_catalog_last_coordinates = { emoji_catalog_last_coordinates = {

4
static/js/ui.js
View File

@@ -26,6 +26,10 @@ exports.update_scrollbar = function (element) {
element.perfectScrollbar('update'); element.perfectScrollbar('update');
}; };
exports.destroy_scrollbar = function (element) {
element.perfectScrollbar('destroy');
};
function update_message_in_all_views(message_id, callback) { function update_message_in_all_views(message_id, callback) {
_.each([message_list.all, home_msg_list, message_list.narrowed], function (list) { _.each([message_list.all, home_msg_list, message_list.narrowed], function (list) {
if (list === undefined) { if (list === undefined) {