From 36978aefe7a4bf3065ed8d38a52c1884480c6429 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 27 Oct 2017 10:18:04 +0000 Subject: [PATCH] Bug 17179: Followup - Use Ctrl-Shift-V instead of Ctrl-P and fix error --- .../lib/koha/cateditor/marc-editor.js | 8 +++-- .../prog/en/modules/cataloguing/editor.tt | 34 +++++++++++----------- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js index b71e917..0fadeba 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/marc-editor.js @@ -191,12 +191,14 @@ define( [ 'marc-record', 'koha-backend', 'preferences', 'text-marc', 'widget' ], } }, - 'Ctrl-P': function( cm ) { + 'Shift-Ctrl-V': function( cm ) { // Paste line from "clipboard" if ( cm.somethingSelected() ) return true; var cBoard = document.getElementById("clipboard"); - var strUser = cBoard.options[cBoard.selectedIndex].text; - cm.replaceRange( strUser, cm.getCursor(), null ); + if ( cBoard.selectedIndex.length > 0 ) { + var strUser = cBoard.options[cBoard.selectedIndex].text; + cm.replaceRange( strUser, cm.getCursor(), null ); + } }, 'Ctrl-I': function( cm ) { diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt index dc80e27..8fcd6f3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt @@ -267,6 +267,14 @@ + Ctrl-C + Copy current field + + + Ctrl-Shift-C + Copy current subfield + + Ctrl-D Insert delimiter (‡) @@ -275,26 +283,22 @@ Get help on current subfield - Ctrl-S - Save record + Ctrl-I + Copy current field on next line - Ctrl-C - Copy current field + Ctrl-S + Save record - Ctrl-Shift-C - Copy current subfield + Ctrl-V + Paste from system clipboard - Ctrl-P + Ctrl-Shift-V Paste selection from "clipboard" - Ctrl-V - Paste from system clipboard - - Ctrl-X Delete current field @@ -303,8 +307,8 @@ Delete current subfield - Ctrl-I - Copy current field on next line + Ctrl-Z + Undo previous action Enter @@ -322,10 +326,6 @@ Shift-Tab Move to previous position - - Ctrl-Z - Undo previous action - -- 2.1.4