scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-12-11 14:45:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix status column emojis [SCI-6407]

Browse source
This commit is contained in:
Anton 2022-01-11 11:25:16 +01:00
parent 60cb0e7a53
commit 304727257e
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/repository_columns/columns_initializers/status_column_type.js
View file

@ -54,7 +54,7 @@ var RepositoryStatusColumnType = (function() {
var picker = new EmojiButton({ rootElement: document.getElementById('manage-repository-column') }); var picker = new EmojiButton({ rootElement: document.getElementById('manage-repository-column') });
var iconElement = this; var iconElement = this;
picker.on('emoji', emoji => { picker.on('emoji', emoji => {
$(iconElement).attr('emoji', emoji).html(twemoji.parse(emoji)); $(iconElement).attr('emoji', emoji.emoji).html(twemoji.parse(emoji.emoji));
validateForm(); validateForm();
}); });
@ -63,7 +63,9 @@ var RepositoryStatusColumnType = (function() {
} else { } else {
picker.showPicker(iconElement); picker.showPicker(iconElement);
} }
twemoji.parse($('.emoji-picker').last().find('.emoji-picker__tab-body')[1]); $.each($('.emoji-picker__emojis').last().find('.emoji-picker__container'), function(i, container) {
twemoji.parse(container);
});
}) })
.on('click', '.emoji-picker__tab-body.active .emoji-picker__emoji', function() { .on('click', '.emoji-picker__tab-body.active .emoji-picker__emoji', function() {
if ($('.emoji-picker__variant-popup').length) { if ($('.emoji-picker__variant-popup').length) {
@ -73,7 +75,7 @@ var RepositoryStatusColumnType = (function() {
.on('click', '.emoji-picker__tab', function() { .on('click', '.emoji-picker__tab', function() {
$.each($('.emoji-picker__tab'), (i, tab) => { $.each($('.emoji-picker__tab'), (i, tab) => {
if ($(tab).hasClass('active')) { if ($(tab).hasClass('active')) {
twemoji.parse($('.emoji-picker__tab-body')[i]); twemoji.parse($('.emoji-picker__container')[i]);
} }
}); });
}); });

2
app/assets/stylesheets/repository_columns/status_type.scss
View file

@ -168,7 +168,7 @@
} }
.emoji-picker__emojis { .emoji-picker__emojis {
height: 14rem; height: 28rem;
} }
.emoji-picker__variant-popup { .emoji-picker__variant-popup {

5
app/javascript/packs/emoji_button.js
View file

@ -1,4 +1,7 @@
global.twemoji = require('twemoji').default; global.twemoji = require('twemoji').default;
global.twemoji.base = '/images/twemoji/'; global.twemoji.base = '/images/twemoji/';
global.twemoji.size = '24x24'; global.twemoji.size = '24x24';
global.EmojiButton = require('@joeattardi/emoji-button/dist/index');
import { EmojiButton } from '@joeattardi/emoji-button';
global.EmojiButton = EmojiButton;