scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 07:26:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4787 from aignatov-bio/ai-sci-7540-micro-interactions-fixes

Browse source 
Micro interactions fixes [SCI-7540]
This commit is contained in:
aignatov-bio 2023-01-10 12:12:44 +01:00 committed by GitHub
parent 288c255c44 b710d15831
commit d5bd26a31b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/experiments/table.js
View file

@ -57,7 +57,8 @@ var ExperimnetTable = {
row += `
<div class="table-body-cell">
<div ref="dropdown" class="dropdown my-module-menu" data-url="${data.urls.actions_dropdown}">
<div class="btn btn-ligh icon-btn" data-toggle="dropdown" >
<div class="btn btn-ligh icon-btn open-my-module-menu" tabindex="0"
data-toggle="dropdown" aria-haspopup="true" aria-expanded="true" >
<i class="fas fa-ellipsis-h"></i>
</div>
<div class="dropdown-menu dropdown-menu-right">
@ -273,6 +274,11 @@ var ExperimnetTable = {
e.preventDefault();
e.stopPropagation();
});
$(this.table).on('keyup', '.assigned-users-container, .open-my-module-menu, .calendar-input', (e) => {
if (e.keyCode === 13) { // Enter
e.target.click();
}
});
$(this.table).on('change keyup', '.assign-users-dropdown .user-search', (e) => {
let query = e.target.value;
let usersList = $(e.target).closest('.dropdown-menu').find('.user-container');
@ -654,7 +660,7 @@ ExperimnetTable.render.tags = function(data) {
ExperimnetTable.render.comments = function(data) {
if (data.count === 0 && !data.can_create) return '<span class="disabled">0</span>';
return `<a href="#"
class="open-comments-sidebar" id="comment-count-${data.id}"
class="open-comments-sidebar" tabindex=0 id="comment-count-${data.id}"
data-object-type="MyModule" data-object-id="${data.id}">
${data.count > 0 ? data.count : '+'}
${data.count_unseen > 0 ? `<span class="unseen-comments"> ${data.count_unseen} </span>` : ''}

5
app/assets/stylesheets/experiment/table.scss
View file

@ -175,6 +175,10 @@
}
}
.open-my-module-menu:focus {
box-shadow: 0 0 0 1px $brand-focus;
}
.assign-users-dropdown {
.dropdown-menu {
padding: .5em;
@ -393,7 +397,6 @@
}
.open-comments-sidebar {
display: contents;
margin-bottom: 0;
}

2
app/views/experiments/_assigned_users.html.erb
View file

@ -3,7 +3,7 @@
<%= I18n.t('experiments.table.not_set') %>
<% else %>
<div ref="dropdown" class="assign-users-dropdown dropdown" data-view-only="<%= !can_manage_my_module_designated_users?(user, my_module) %>">
<div class="assigned-users-container" data-toggle="dropdown">
<div class="assigned-users-container" tabindex="0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
<% users[0..3].each_with_index do |user, i| %>
<span class="avatar-container" style="z-index: <%= 5 - i %>">
<%= image_tag avatar_path(user, :icon_small), title: user.full_name %>