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

dependencies: Upgrade simplebar from 4.2.3 to 5.0.7.

Browse Source 
Signed-off-by: Anders Kaseorg <anders@zulipchat.com>
This commit is contained in:
Anders Kaseorg
2019-11-13 12:04:29 -08:00
committed by Tim Abbott
parent 0f4b6dd0c1
commit 2c4101dbc5
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/ui.js
View File

@@ -1,4 +1,4 @@
const SimpleBar = require("simplebar").default;
const SimpleBar = require("simplebar/dist/simplebar.js");
// What, if anything, obscures the home tab?
@@ -13,16 +13,18 @@ exports.replace_emoji_with_text = function (element) {
exports.get_content_element = function (element_selector) {
const element = element_selector.expectOne()[0];
if (element.SimpleBar) {
return $(element.SimpleBar.getContentElement());
const sb = SimpleBar.instances.get(element);
if (sb) {
return $(sb.getContentElement());
}
return element_selector;
};
exports.get_scroll_element = function (element_selector) {
const element = element_selector.expectOne()[0];
if (element.SimpleBar) {
return $(element.SimpleBar.getScrollElement());
const sb = SimpleBar.instances.get(element);
if (sb) {
return $(sb.getScrollElement());
} else if ('simplebar' in element.dataset) {
// The SimpleBar mutation observer hasn’t processed this element yet.
// Create the SimpleBar early in case we need to add event listeners.
@@ -33,8 +35,9 @@ exports.get_scroll_element = function (element_selector) {
exports.reset_scrollbar = function (element_selector) {
const element = element_selector.expectOne()[0];
if (element.SimpleBar) {
element.SimpleBar.getScrollElement().scrollTop = 0;
const sb = SimpleBar.instances.get(element);
if (sb) {
sb.getScrollElement().scrollTop = 0;
} else {
element.scrollTop = 0;
}