gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 21362: Advanced editor: Fix tab navigation in fixed fields 

Also minor tweaks to how the fields look.

Test plan:

1. Try moving from field to field and inside control fields with tab/shift-tab.
2. Make sure focus doesn't get stuck in any position.

Signed-off-by: Michal Denar <black23@gmail.com>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Ere Maijala 2017-10-13 14:07:21 +03:00 committed by Nick Clemens
parent 1b56e446ed
commit 024643f51c
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
koha-tmpl/intranet-tmpl/lib/koha/cateditor/widget.js
View File

@ -61,10 +61,11 @@ define( [ 'resources' ], function( Resources ) {
// Fixed field utils
bindFixed: function( sel, start, end ) {
var $node = $( this.node ).find( sel );
$node.val( this.getFixed( start, end ) );
var val = this.getFixed( start, end );
$node.val( val );
var widget = this;
var $collapsed = $( '<span class="fixed-collapsed" title="' + $node.attr('title') + '">' + $node.val() + '</span>' ).insertAfter( $node );
var $collapsed = $( '<span class="fixed-collapsed" title="' + $node.attr('title') + '">' + val + '</span>' ).insertAfter( $node );
function show() {
$collapsed.hide();
@ -75,7 +76,8 @@ define( [ 'resources' ], function( Resources ) {
function hide() {
$node.hide();
$collapsed.text( Widget.PadStringRight( $node.val(), end - start ) ).show();
var val = $node.val();
$collapsed.text( Widget.PadStringRight( val === null ? '' : val, end - start ) ).show();
}
$node.on( 'change keyup', function() {
@ -92,6 +94,9 @@ define( [ 'resources' ], function( Resources ) {
},
setFixed: function( start, end, value, source ) {
if ( null === value ) {
value = '';
}
this.setText( this.text.substring( 0, start ) + Widget.PadStringRight( value.toString().substr( 0, end - start ), end - start ) + this.text.substring( end ), source );
},
@ -118,6 +123,7 @@ define( [ 'resources' ], function( Resources ) {
$matSelect.change( function() {
widget.loadXMLMaterial( materialInfo[ $matSelect.val() ] );
widget.nodeChanged();
} ).change();
} );
},
@ -169,11 +175,12 @@ define( [ 'resources' ], function( Resources ) {
$inputs.each( function( i ) {
$(this).on( 'keydown.marc-tab', function( e ) {
// Cheap hack to disable backspace and special keys
if ( ( this.nodeName.toLowerCase() == 'select' && e.which == 9 ) || e.ctrlKey ) {
e.preventDefault();
return;
} else if ( e.which != 9 ) { // Tab
// Handle tab/shift-tab
if ( e.which != 9 ) { // 9 = Tab
// Cheap hack to disable backspace and special keys
if ( e.ctrlKey ) {
e.preventDefault();
}
return;
}
@ -182,7 +189,12 @@ define( [ 'resources' ], function( Resources ) {
if ( e.shiftKey ) {
if ( i > 0 ) {
$inputs.eq(i - 1).trigger( 'focus' );
var $input = $inputs.eq( i - 1 );
if ( $input.is( ':visible' ) ) {
$input.focus();
} else {
$input.next('span').click();
}
} else {
editor.cm.setCursor( span.from );
// FIXME: ugly hack
@ -191,7 +203,12 @@ define( [ 'resources' ], function( Resources ) {
}
} else {
if ( i < $inputs.length - 1 ) {
$inputs.eq(i + 1).trigger( 'focus' );
var $input = $inputs.eq( i + 1 );
if ( $input.is( ':visible' ) ) {
$input.focus();
} else {
$input.next('span').click();
}
} else {
editor.cm.setCursor( span.to );
editor.focus();

5
koha-tmpl/intranet-tmpl/prog/css/cateditor.css
View File

@ -131,7 +131,7 @@ body {
font-family: inherit;
line-height: 2.75;
margin: 3px 0;
padding: 4px;
padding: 2px;
}
#editor .subfield-widget select, #editor .subfield-widget input {
@ -145,6 +145,9 @@ body {
#editor .fixed-widget input {
width: 4em;
padding: 0;
border-radius: 2px;
border-width: 1px;
}
#editor .fixed-widget select {