diff --git a/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee b/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
index 2ce2ec6fc..868f303e7 100644
--- a/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
+++ b/app/assets/javascripts/app/controllers/widget/keyboard_shortcuts.coffee
@@ -443,6 +443,19 @@ App.Config.set(
description: 'Format as //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'
hotkeys: true
diff --git a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
index e4f6f8338..7947049ec 100644
--- a/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
+++ b/app/assets/javascripts/app/lib/base/jquery.contenteditable.js
@@ -199,7 +199,7 @@
|| e.keyCode == 75
|| e.keyCode == 76
|| e.keyCode == 85
- || e.keyCode == 86
+ || e.keyCode == 83
|| e.keyCode == 88
|| e.keyCode == 90
|| e.keyCode == 89)) {
@@ -237,7 +237,7 @@
if (e.keyCode == 85) {
document.execCommand('underline')
}
- if (e.keyCode == 86) {
+ if (e.keyCode == 83) {
document.execCommand('strikeThrough')
}
if (e.keyCode == 88) {
diff --git a/app/assets/javascripts/app/views/keyboard_shortcuts.jst.eco b/app/assets/javascripts/app/views/keyboard_shortcuts.jst.eco
index 587689fa6..a14ce22a6 100644
--- a/app/assets/javascripts/app/views/keyboard_shortcuts.jst.eco
+++ b/app/assets/javascripts/app/views/keyboard_shortcuts.jst.eco
@@ -37,6 +37,9 @@
<% else if shortcut.magicKey: %>
<%= @magicKey %>
<% end %>
+ <% if shortcut.shiftKey: %>
+ shift
+ <% end %>
<% if shortcut.keyPrefix: %>
<%= shortcut.keyPrefix %>
<% end %>