scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-30 20:23:14 +08:00
Code Issues Projects Releases Packages Wiki Activity

Removed autofocus clear on open reminder flyout [SCI-6690] (#4003)

Browse source 
* Removed clear autofocus on open reminder flyout [SCI-6690]

* Fix hound [SCI-6690]
This commit is contained in:
ajugo 2022-04-08 18:08:55 +02:00 committed by GitHub
parent 0a5e93a018
commit 986e817fdc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/assets/javascripts/my_modules/repositories.js
View file

@ -184,7 +184,8 @@ var MyModuleRepositories = (function() {
var recordName = "<a href='" + row.recordInfoUrl + "'"
+ "class='record-info-link'>" + data + '</a>';
if (row.hasActiveReminders) {
recordName = `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}">
recordName = `<div class="dropdown row-reminders-dropdown"
data-row-reminders-url="${row.rowRemindersUrl}" tabindex='-1'>
<i class="fas fa-bell dropdown-toggle row-reminders-icon"
data-toggle="dropdown" id="rowReminders${row.DT_RowId}}"></i>
<ul class="dropdown-menu" role="menu" aria-labelledby="rowReminders${row.DT_RowId}">

5
app/assets/javascripts/repositories/renderers/view_renderers.js
View file

@ -188,8 +188,9 @@ $.fn.dataTable.render.AssignedTasksValue = function(data, row) {
tasksLinkHTML = "<div class='assign-counter-container'><span class='assign-counter'>0</span></div>";
}
if (row.hasActiveReminders) {
return `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}">
<i class="fas fa-bell dropdown-toggle row-reminders-icon" data-toggle="dropdown" id="rowReminders${row.DT_RowId}}"></i>
return `<div class="dropdown row-reminders-dropdown" data-row-reminders-url="${row.rowRemindersUrl}" tabindex='-1'>
<i class="fas fa-bell dropdown-toggle row-reminders-icon" data-toggle="dropdown"
id="rowReminders${row.DT_RowId}}"></i>
<ul class="dropdown-menu" role="menu" aria-labelledby="rowReminders${row.DT_RowId}">
</ul>
</div>`

4
app/assets/javascripts/sitewide/repository_helper.js
View file

@ -66,7 +66,7 @@ function prepareRepositoryHeaderForExport(th) {
function initReminderDropdown(table) {
$(table).on('keyup', '.row-reminders-dropdown', function(e) {
if (e.key === 'Escape') {
$(this).dropdown('toggle');
$(this).children('.dropdown-menu').dropdown('toggle');
}
});
$(table).on('show.bs.dropdown', '.row-reminders-dropdown', function() {
@ -85,8 +85,6 @@ function initReminderDropdown(table) {
dataType: 'json',
success: function(data) {
dropdownMenu.html(data.html);
dropdownMenu.find('.row-reminders-footer')[0].focus();
}
});
});

2
app/assets/stylesheets/layouts/reminders.scss
View file

@ -25,6 +25,6 @@
background-color: $color-alto;
border-width: 0;
height: 1px;
margin: 0 16px 10px 0;
margin: 0 16px 10px;
}
}