Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-22 20:13:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Lighten the "More" button handler when checks are not necessary

Browse source
This commit is contained in:
Jérémie Astori 2018-04-08 01:04:25 -04:00
parent 8d255fc331
commit dbabdd83dc
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
2 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/js/lounge.js
View file

@ -254,8 +254,6 @@ $(function() {
if (!keepSidebarOpen && $(window).outerWidth() < utils.mobileViewportPixels) {
slideoutMenu.toggle(false);
}
utils.togglePreviewMoreButtonsIfNeeded();
}
const lastActive = $("#windows > .active");
@ -281,6 +279,8 @@ $(function() {
.addClass("active")
.trigger("show");
utils.togglePreviewMoreButtonsIfNeeded();
let title = $(document.body).data("app-name");
const chanTitle = chan.attr("aria-label");

40
client/js/renderPreview.js
View file

@ -72,32 +72,44 @@ function appendPreview(preview, msg, template) {
const moreBtn = previewContainer.find(".more");
const previewContent = previewContainer.find(".toggle-content");
// Depending on the size of the preview and the text within it, show or hide a
// "More" button that allows users to expand without having to open the link.
// Warning: Make sure to call this only on active channel, link previews only,
// expanded only.
const showMoreIfNeeded = () => {
// Only applies on previews:
if (channel.hasClass("active") && // in the current channel
previewContent.hasClass("show") // that are expanded
) {
const isVisible = moreBtn.is(":visible");
const shouldShow = previewContent[0].offsetWidth >= previewContainer[0].offsetWidth;
const isVisible = moreBtn.is(":visible");
const shouldShow = previewContent[0].offsetWidth >= previewContainer[0].offsetWidth;
if (!isVisible && shouldShow) {
moreBtn.show();
} else if (isVisible && !shouldShow) {
togglePreviewMore(moreBtn, false);
moreBtn.hide();
}
if (!isVisible && shouldShow) {
moreBtn.show();
} else if (isVisible && !shouldShow) {
togglePreviewMore(moreBtn, false);
moreBtn.hide();
}
};
// "More" button only applies on text previews
if (preview.type === "link") {
$(window).on("resize", debounce(showMoreIfNeeded, 150));
window.requestAnimationFrame(showMoreIfNeeded);
// On resize, only touch previews in the current channel that are expanded
$(window).on("resize", debounce(() => {
if (channel.hasClass("active") && previewContent.hasClass("show")) {
showMoreIfNeeded();
}
}, 150));
// This event is triggered when a side menu is opened/closed, or when the
// preview gets expanded/collapsed.
previewContent.on("showMoreIfNeeded",
() => window.requestAnimationFrame(showMoreIfNeeded)
);
}
if (activeChannelId === channelId) {
// If this preview is in active channel, hide "More" button if necessary
if (preview.type === "link") {
window.requestAnimationFrame(showMoreIfNeeded);
}
container.trigger("keepToBottom");
}
}