Skip to content

Commit d63ccd1

Browse files
authored
Merge pull request #52 from ishikawa999/task/50
Fix problem with search box not displaying after switching languages
2 parents 4fc662e + 2e0b57b commit d63ccd1

File tree

4 files changed

+10
-3
lines changed

4 files changed

+10
-3
lines changed

app/views/custom_message_settings/_messages.html.erb

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ $(document).ready(function() {
1212
setSelect2();
1313
});
1414

15-
let currentSearchKeyword;
15+
// Fix a problem with focus not working in Redmine 5.0 or later.
16+
// issue: https://github.com/select2/select2/issues/5993
17+
$(document).on('select2:open', function() {
18+
document.querySelector('.select2-search__field').focus();
19+
});
20+
21+
var currentSearchKeyword;
1622
$('#key-selector').on('select2:select', function (e) {
1723
var key = e.params.data.id;
1824
var val = e.params.data.text;
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
$('#edit-custom-messages').html("<%= j (render 'custom_message_settings/messages', lang: @lang) %>");
22
$('#default-messages-link').replaceWith('<%= open_default_messages_window_link(@lang) %>')
3+
setSelect2();
34
$('#ajax-indicator').hide();

assets/stylesheets/custom_messages.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
text-decoration: none;
2727
}
2828

29-
.select2-container--default .select2-results__option span.key {
29+
.select2-container--default .select2-results__option:not(.select2-results__option--highlighted) span.key {
3030
color: gray;
3131
}
3232
.select2-container--default .select2-results__option[aria-disabled=true] {

init.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
p = Redmine::Plugin.register :redmine_message_customize do
77
name 'Redmine message customize plugin'
8-
version '0.1.3'
8+
version '0.1.4'
99
description 'This is a plugin that allows messages in Redmine to be overwritten from the admin view'
1010
settings default: { custom_messages: {} }
1111
menu :admin_menu, :custom_messages, { controller: 'custom_message_settings', action: 'edit' },

0 commit comments

Comments
 (0)