Fixes issue #3276 - Software error when Elasticsearch is not configured and rake searchindex:rebuild

This commit is contained in:
Martin Edenhofer 2020-12-24 00:04:54 +01:00
parent e2e9ebffaf
commit 0756b7ac23
3 changed files with 18 additions and 2 deletions

View file

@ -443,6 +443,19 @@ App.Config.set(
description: 'Format as //strikethrough//' description: 'Format as //strikethrough//'
globalEvent: 'richtext-strikethrough' globalEvent: 'richtext-strikethrough'
} }
{
key: 'v'
magicKey: true
description: 'Paste from clipboard'
globalEvent: 'clipboard-paste'
}
{
key: 'v'
magicKey: true
shiftKey: true
description: 'Paste from clipboard (plain text)'
globalEvent: 'clipboard-paste-plain-text'
}
{ {
key: 'f' key: 'f'
hotkeys: true hotkeys: true

View file

@ -199,7 +199,7 @@
|| e.keyCode == 75 || e.keyCode == 75
|| e.keyCode == 76 || e.keyCode == 76
|| e.keyCode == 85 || e.keyCode == 85
|| e.keyCode == 86 || e.keyCode == 83
|| e.keyCode == 88 || e.keyCode == 88
|| e.keyCode == 90 || e.keyCode == 90
|| e.keyCode == 89)) { || e.keyCode == 89)) {
@ -237,7 +237,7 @@
if (e.keyCode == 85) { if (e.keyCode == 85) {
document.execCommand('underline') document.execCommand('underline')
} }
if (e.keyCode == 86) { if (e.keyCode == 83) {
document.execCommand('strikeThrough') document.execCommand('strikeThrough')
} }
if (e.keyCode == 88) { if (e.keyCode == 88) {

View file

@ -37,6 +37,9 @@
<% else if shortcut.magicKey: %> <% else if shortcut.magicKey: %>
<kbd><%= @magicKey %></kbd> <kbd><%= @magicKey %></kbd>
<% end %> <% end %>
<% if shortcut.shiftKey: %>
<kbd>shift</kbd>
<% end %>
<% if shortcut.keyPrefix: %> <% if shortcut.keyPrefix: %>
<%= shortcut.keyPrefix %> <%= shortcut.keyPrefix %>
<% end %> <% end %>