Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FIX] 50 custom emoji limit #14951

Merged
merged 2 commits into from
Jul 11, 2019
Merged

[FIX] 50 custom emoji limit #14951

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9aacdba
fix 50 custom emoji
ggazzo Jul 9, 2019
934b41d
opss
ggazzo Jul 9, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion app/emoji-custom/client/admin/adminEmoji.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,10 @@ Template.adminEmoji.helpers({
hasMore() {
if (Template.instance().limit != null) {
if (typeof Template.instance().customemoji === 'function') {
return Template.instance().limit.get() === Template.instance().customemoji().length;
return (
Template.instance().limit.get()
=== Template.instance().customemoji().length
ggazzo marked this conversation as resolved.
Show resolved Hide resolved
);
}
}
return false;
Expand All @@ -42,6 +45,18 @@ Template.adminEmoji.helpers({
data: Template.instance().tabBarData.get(),
};
},
onTableScroll() {
const instance = Template.instance();
return function(currentTarget) {
if ((currentTarget.offsetHeight + currentTarget.scrollTop) < (currentTarget.scrollHeight - 100)) {
return;
}
if (Template.instance().limit.get() > Template.instance().customemoji().length) {
return false;
}
instance.limit.set(instance.limit.get() + 50);
};
},
onTableItemClick() {
const instance = Template.instance();
return function({ _id }) {
Expand Down