April 2025 - Evergreen-commits - Evergreen Mailing Lists Server

[GIT] Evergreen ILS branch main updated. a5df968f42b35778c20d2c09296144f3fb81d8e8
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via a5df968f42b35778c20d2c09296144f3fb81d8e8 (commit) from bd3ea719ce11cfb2cdf48df080ae662bb26648d6 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit a5df968f42b35778c20d2c09296144f3fb81d8e8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 22:27:21 2025 +0000 LP2095532 Ctrl+arrow creates only one new MARC row In the MARC rich editor, call preventDefault() and stopPropagation() on keydown handlers when pressing Control + the up or down arrow to avoid creating duplicate copies of the current row (due to similar handlers in both the editable content and rich editor components). See also bug 2084199 for related keyboard operation errors prior to 3.13.6 and 3.14.1. Release-note: Prevents duplicate new MARC rows using Control + Arrow key Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Carol Witt <wittc(a)cwmars.org> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts index 1e04fba77a..1f47d958af 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.ts @@ -564,6 +564,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+down == copy current field down one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field)); } @@ -587,6 +589,8 @@ implements OnInit, AfterViewInit, OnDestroy { if (evt.ctrlKey && !evt.shiftKey && !(this.fieldType === 'ldr' || this.fieldType === 'ffld')) { // ctrl+up == copy current field up one + evt.preventDefault(); + evt.stopPropagation(); this.context.insertField( this.field, this.record.cloneField(this.field), true); } ----------------------------------------------------------------------- Summary of changes: .../eg2/src/app/staff/share/marc-edit/editable-content.component.ts | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. 8bc7e83744a57e55322e01bc9d2ff2cede2739f8
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_13 has been updated via 8bc7e83744a57e55322e01bc9d2ff2cede2739f8 (commit) from fd7e175ec053058ec0e24adbd7f3aec8f2dfe197 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8bc7e83744a57e55322e01bc9d2ff2cede2739f8 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 00:49:47 2025 +0000 LP2101884 MARC Rich Editor subfield tabbing order Changes the MARC rich editor keyboard navigation behavior so that either the right or left arrows can be used to move from grouped subfield focus (with all three inputs highlighted at once) into the subfield for editing. Also moves focus into the subfield value rather than the code. Additionally, changes the tabindex of the currently focused subfield group to -1 so that the group is not part of the tabbing order when moving out of the subfield inputs (in either direction). That is, tabbing out of the subfield group goes directly to the next or previous group rather than the current one. Release-note: Edit MARC subfield value in focused group with right or left arrow; do not focus on current group when tabbing into or out of subfield inputs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html index aa558a1db8..3922b5abe8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html @@ -33,6 +33,7 @@ Track their labels here. <ng-container *ngIf="!bigText"> <eg-combobox #MARCCombo *ngIf="suggest" + trigger="click" [domId]="domId" [moreClasses]="'fw-bold form-control-sm type-'+fieldType" tabindex="{{tabindex}}" diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index cfce36f413..1df38c3658 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -439,24 +439,20 @@ export class MarcEditContext { this.insertSubfield(field, newSf); } - // Focus the requested subfield by its position. If its - // position is less than zero, focus the field's tag instead. + // Focus the requested subfield by its position. focusSubfield(field: MarcField, position: number, group?: boolean) { - - const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'tag'}; - - if (position >= 0) { - // Focus the code instead of the value, because attempting to - // focus an empty (editable) div results in nothing getting focus. - focus.target = 'sfc'; - focus.sfOffset = position; - } + // console.debug("focusSubfield()", field, position, group); + const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; if (group) { focus.target = 'group'; - focus.sfOffset = position; + } else if (position < 0) { + // Focus the code instead of the value + focus.target = 'sfc'; } + focus.sfOffset = position; + this.requestFieldFocus(focus); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html index 396a46636d..9b9b556055 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html @@ -146,7 +146,7 @@ <li i18n>Copy Current Row Above: Ctrl+Up</li> <li i18n>Copy Current Row Below: Ctrl+Down</li> <li i18n>Add Subfield: Ctrl+D or Ctrl+I</li> - <li i18n>Edit Subfield (when grouped): Right Arrow</li> + <li i18n>Edit Subfield (when grouped): Left or Right Arrow</li> <li i18n>Remove Row: Ctrl+Del</li> <li i18n>Remove Subfield: Shift+Del</li> <li i18n>Open Suggestions: Ctrl+Shift+Down</li> @@ -314,10 +314,10 @@ 'full-width': subfield[1].length > 100 || context.isFullWidth(field.tag, subfield[0]), 'last': last }" - tabindex="0" - [id]="'subfield-{{subfield[2]}}'" + [tabindex]="getSubfieldTabindex(field, subfield)" + [id]="getSubfieldDomId(field, subfield)" (keydown)="onKeyDown($event, field, subfield)" - attr.aria-description="Press right arrow to edit." + [attr.aria-description]="'Press right or left arrow to edit.'" i18n-aria-label i18n-aria-description> <ng-container #subfieldContent *ngTemplateOutlet="subfieldChunk;context:{field:field,subfield:subfield,tabIndex:context.subfieldHasFocus(field, subfield) ? 0 : -1}"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 3dbdca5839..12b3450e78 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -209,6 +209,7 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { + case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); let el = evt.target as HTMLElement; @@ -345,6 +346,18 @@ export class MarcRichEditorComponent implements OnInit { evt.stopPropagation(); } + getSubfieldDomId(field, subfield) { + return 'subfield-' + field.tag+subfield[0] + '-' + subfield[2]; + } + + getSubfieldTabindex(field, subfield) { + const subfieldGroupElement = document.getElementById(this.getSubfieldDomId(field, subfield)) as HTMLElement; + if (subfieldGroupElement?.contains(document.activeElement)) { + return -1; + } + return 0; + } + focusSubfieldGroup(field: MarcField, subfield: MarcSubfield) { // set lastFocused to subfield group for undo/redo purposes, // but do not emit a focus request ----------------------------------------------------------------------- Summary of changes: .../share/marc-edit/editable-content.component.html | 1 + .../src/app/staff/share/marc-edit/editor-context.ts | 20 ++++++++------------ .../staff/share/marc-edit/rich-editor.component.html | 8 ++++---- .../staff/share/marc-edit/rich-editor.component.ts | 13 +++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 0069ca2d6bd91a15ddf52ce6b4dd936e5d7d414b
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 0069ca2d6bd91a15ddf52ce6b4dd936e5d7d414b (commit) from 8e64a75b9dd259eba55f350802ffb821700b09dd (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 0069ca2d6bd91a15ddf52ce6b4dd936e5d7d414b Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 00:49:47 2025 +0000 LP2101884 MARC Rich Editor subfield tabbing order Changes the MARC rich editor keyboard navigation behavior so that either the right or left arrows can be used to move from grouped subfield focus (with all three inputs highlighted at once) into the subfield for editing. Also moves focus into the subfield value rather than the code. Additionally, changes the tabindex of the currently focused subfield group to -1 so that the group is not part of the tabbing order when moving out of the subfield inputs (in either direction). That is, tabbing out of the subfield group goes directly to the next or previous group rather than the current one. Release-note: Edit MARC subfield value in focused group with right or left arrow; do not focus on current group when tabbing into or out of subfield inputs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html index aa558a1db8..3922b5abe8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html @@ -33,6 +33,7 @@ Track their labels here. <ng-container *ngIf="!bigText"> <eg-combobox #MARCCombo *ngIf="suggest" + trigger="click" [domId]="domId" [moreClasses]="'fw-bold form-control-sm type-'+fieldType" tabindex="{{tabindex}}" diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index cfce36f413..1df38c3658 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -439,24 +439,20 @@ export class MarcEditContext { this.insertSubfield(field, newSf); } - // Focus the requested subfield by its position. If its - // position is less than zero, focus the field's tag instead. + // Focus the requested subfield by its position. focusSubfield(field: MarcField, position: number, group?: boolean) { - - const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'tag'}; - - if (position >= 0) { - // Focus the code instead of the value, because attempting to - // focus an empty (editable) div results in nothing getting focus. - focus.target = 'sfc'; - focus.sfOffset = position; - } + // console.debug("focusSubfield()", field, position, group); + const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; if (group) { focus.target = 'group'; - focus.sfOffset = position; + } else if (position < 0) { + // Focus the code instead of the value + focus.target = 'sfc'; } + focus.sfOffset = position; + this.requestFieldFocus(focus); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html index 396a46636d..9b9b556055 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html @@ -146,7 +146,7 @@ <li i18n>Copy Current Row Above: Ctrl+Up</li> <li i18n>Copy Current Row Below: Ctrl+Down</li> <li i18n>Add Subfield: Ctrl+D or Ctrl+I</li> - <li i18n>Edit Subfield (when grouped): Right Arrow</li> + <li i18n>Edit Subfield (when grouped): Left or Right Arrow</li> <li i18n>Remove Row: Ctrl+Del</li> <li i18n>Remove Subfield: Shift+Del</li> <li i18n>Open Suggestions: Ctrl+Shift+Down</li> @@ -314,10 +314,10 @@ 'full-width': subfield[1].length > 100 || context.isFullWidth(field.tag, subfield[0]), 'last': last }" - tabindex="0" - [id]="'subfield-{{subfield[2]}}'" + [tabindex]="getSubfieldTabindex(field, subfield)" + [id]="getSubfieldDomId(field, subfield)" (keydown)="onKeyDown($event, field, subfield)" - attr.aria-description="Press right arrow to edit." + [attr.aria-description]="'Press right or left arrow to edit.'" i18n-aria-label i18n-aria-description> <ng-container #subfieldContent *ngTemplateOutlet="subfieldChunk;context:{field:field,subfield:subfield,tabIndex:context.subfieldHasFocus(field, subfield) ? 0 : -1}"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 4f39697306..e5fb58b15c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -209,6 +209,7 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { + case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); let el = evt.target as HTMLElement; @@ -345,6 +346,18 @@ export class MarcRichEditorComponent implements OnInit { evt.stopPropagation(); } + getSubfieldDomId(field, subfield) { + return 'subfield-' + field.tag+subfield[0] + '-' + subfield[2]; + } + + getSubfieldTabindex(field, subfield) { + const subfieldGroupElement = document.getElementById(this.getSubfieldDomId(field, subfield)) as HTMLElement; + if (subfieldGroupElement?.contains(document.activeElement)) { + return -1; + } + return 0; + } + focusSubfieldGroup(field: MarcField, subfield: MarcSubfield) { // set lastFocused to subfield group for undo/redo purposes, // but do not emit a focus request ----------------------------------------------------------------------- Summary of changes: .../share/marc-edit/editable-content.component.html | 1 + .../src/app/staff/share/marc-edit/editor-context.ts | 20 ++++++++------------ .../staff/share/marc-edit/rich-editor.component.html | 8 ++++---- .../staff/share/marc-edit/rich-editor.component.ts | 13 +++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 30865c0e32c02efc5515a6cf1ecea83c456b5ed5
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 30865c0e32c02efc5515a6cf1ecea83c456b5ed5 (commit) from 21f7dddd8377d6173f2038180a052fd903ffafa0 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 30865c0e32c02efc5515a6cf1ecea83c456b5ed5 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 00:49:47 2025 +0000 LP2101884 MARC Rich Editor subfield tabbing order Changes the MARC rich editor keyboard navigation behavior so that either the right or left arrows can be used to move from grouped subfield focus (with all three inputs highlighted at once) into the subfield for editing. Also moves focus into the subfield value rather than the code. Additionally, changes the tabindex of the currently focused subfield group to -1 so that the group is not part of the tabbing order when moving out of the subfield inputs (in either direction). That is, tabbing out of the subfield group goes directly to the next or previous group rather than the current one. Release-note: Edit MARC subfield value in focused group with right or left arrow; do not focus on current group when tabbing into or out of subfield inputs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html index aa558a1db8..3922b5abe8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html @@ -33,6 +33,7 @@ Track their labels here. <ng-container *ngIf="!bigText"> <eg-combobox #MARCCombo *ngIf="suggest" + trigger="click" [domId]="domId" [moreClasses]="'fw-bold form-control-sm type-'+fieldType" tabindex="{{tabindex}}" diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index cfce36f413..1df38c3658 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -439,24 +439,20 @@ export class MarcEditContext { this.insertSubfield(field, newSf); } - // Focus the requested subfield by its position. If its - // position is less than zero, focus the field's tag instead. + // Focus the requested subfield by its position. focusSubfield(field: MarcField, position: number, group?: boolean) { - - const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'tag'}; - - if (position >= 0) { - // Focus the code instead of the value, because attempting to - // focus an empty (editable) div results in nothing getting focus. - focus.target = 'sfc'; - focus.sfOffset = position; - } + // console.debug("focusSubfield()", field, position, group); + const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; if (group) { focus.target = 'group'; - focus.sfOffset = position; + } else if (position < 0) { + // Focus the code instead of the value + focus.target = 'sfc'; } + focus.sfOffset = position; + this.requestFieldFocus(focus); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html index adf09a07c8..a439ab51ef 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html @@ -150,7 +150,7 @@ <li i18n>Copy Current Row Above: Ctrl+Up</li> <li i18n>Copy Current Row Below: Ctrl+Down</li> <li i18n>Add Subfield: Ctrl+D or Ctrl+I</li> - <li i18n>Edit Subfield (when grouped): Right Arrow</li> + <li i18n>Edit Subfield (when grouped): Left or Right Arrow</li> <li i18n>Remove Row: Ctrl+Del</li> <li i18n>Remove Subfield: Shift+Del</li> <li i18n>Open Suggestions: Ctrl+Shift+Down</li> @@ -318,10 +318,10 @@ 'full-width': subfield[1].length > 100 || context.isFullWidth(field.tag, subfield[0]), 'last': last }" - tabindex="0" - [id]="'subfield-{{subfield[2]}}'" + [tabindex]="getSubfieldTabindex(field, subfield)" + [id]="getSubfieldDomId(field, subfield)" (keydown)="onKeyDown($event, field, subfield)" - attr.aria-description="Press right arrow to edit." + [attr.aria-description]="'Press right or left arrow to edit.'" i18n-aria-label i18n-aria-description> <ng-container #subfieldContent *ngTemplateOutlet="subfieldChunk;context:{field:field,subfield:subfield,tabIndex:context.subfieldHasFocus(field, subfield) ? 0 : -1}"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 655156c8bb..36b6efbc2c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -213,6 +213,7 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { + case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); let el = evt.target as HTMLElement; @@ -349,6 +350,18 @@ export class MarcRichEditorComponent implements OnInit { evt.stopPropagation(); } + getSubfieldDomId(field, subfield) { + return 'subfield-' + field.tag+subfield[0] + '-' + subfield[2]; + } + + getSubfieldTabindex(field, subfield) { + const subfieldGroupElement = document.getElementById(this.getSubfieldDomId(field, subfield)) as HTMLElement; + if (subfieldGroupElement?.contains(document.activeElement)) { + return -1; + } + return 0; + } + focusSubfieldGroup(field: MarcField, subfield: MarcSubfield) { // set lastFocused to subfield group for undo/redo purposes, // but do not emit a focus request ----------------------------------------------------------------------- Summary of changes: .../share/marc-edit/editable-content.component.html | 1 + .../src/app/staff/share/marc-edit/editor-context.ts | 20 ++++++++------------ .../staff/share/marc-edit/rich-editor.component.html | 8 ++++---- .../staff/share/marc-edit/rich-editor.component.ts | 13 +++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. bd3ea719ce11cfb2cdf48df080ae662bb26648d6
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via bd3ea719ce11cfb2cdf48df080ae662bb26648d6 (commit) from 7e312a090065fb7f96ae0fb79861e16e169fdde4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bd3ea719ce11cfb2cdf48df080ae662bb26648d6 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Wed Apr 2 00:49:47 2025 +0000 LP2101884 MARC Rich Editor subfield tabbing order Changes the MARC rich editor keyboard navigation behavior so that either the right or left arrows can be used to move from grouped subfield focus (with all three inputs highlighted at once) into the subfield for editing. Also moves focus into the subfield value rather than the code. Additionally, changes the tabindex of the currently focused subfield group to -1 so that the group is not part of the tabbing order when moving out of the subfield inputs (in either direction). That is, tabbing out of the subfield group goes directly to the next or previous group rather than the current one. Release-note: Edit MARC subfield value in focused group with right or left arrow; do not focus on current group when tabbing into or out of subfield inputs Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Ruth Frasur Davis <redavis4974(a)gmail.com> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html index aa558a1db8..3922b5abe8 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editable-content.component.html @@ -33,6 +33,7 @@ Track their labels here. <ng-container *ngIf="!bigText"> <eg-combobox #MARCCombo *ngIf="suggest" + trigger="click" [domId]="domId" [moreClasses]="'fw-bold form-control-sm type-'+fieldType" tabindex="{{tabindex}}" diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts index cfce36f413..1df38c3658 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/editor-context.ts @@ -439,24 +439,20 @@ export class MarcEditContext { this.insertSubfield(field, newSf); } - // Focus the requested subfield by its position. If its - // position is less than zero, focus the field's tag instead. + // Focus the requested subfield by its position. focusSubfield(field: MarcField, position: number, group?: boolean) { - - const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'tag'}; - - if (position >= 0) { - // Focus the code instead of the value, because attempting to - // focus an empty (editable) div results in nothing getting focus. - focus.target = 'sfc'; - focus.sfOffset = position; - } + // console.debug("focusSubfield()", field, position, group); + const focus: FieldFocusRequest = {fieldId: field.fieldId, target: 'sfv'}; if (group) { focus.target = 'group'; - focus.sfOffset = position; + } else if (position < 0) { + // Focus the code instead of the value + focus.target = 'sfc'; } + focus.sfOffset = position; + this.requestFieldFocus(focus); } diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html index adf09a07c8..a439ab51ef 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.html @@ -150,7 +150,7 @@ <li i18n>Copy Current Row Above: Ctrl+Up</li> <li i18n>Copy Current Row Below: Ctrl+Down</li> <li i18n>Add Subfield: Ctrl+D or Ctrl+I</li> - <li i18n>Edit Subfield (when grouped): Right Arrow</li> + <li i18n>Edit Subfield (when grouped): Left or Right Arrow</li> <li i18n>Remove Row: Ctrl+Del</li> <li i18n>Remove Subfield: Shift+Del</li> <li i18n>Open Suggestions: Ctrl+Shift+Down</li> @@ -318,10 +318,10 @@ 'full-width': subfield[1].length > 100 || context.isFullWidth(field.tag, subfield[0]), 'last': last }" - tabindex="0" - [id]="'subfield-{{subfield[2]}}'" + [tabindex]="getSubfieldTabindex(field, subfield)" + [id]="getSubfieldDomId(field, subfield)" (keydown)="onKeyDown($event, field, subfield)" - attr.aria-description="Press right arrow to edit." + [attr.aria-description]="'Press right or left arrow to edit.'" i18n-aria-label i18n-aria-description> <ng-container #subfieldContent *ngTemplateOutlet="subfieldChunk;context:{field:field,subfield:subfield,tabIndex:context.subfieldHasFocus(field, subfield) ? 0 : -1}"> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 655156c8bb..36b6efbc2c 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -213,6 +213,7 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { + case 'ArrowLeft': case 'ArrowRight': // console.debug("ArrowRight: ", evt, field, subfield); let el = evt.target as HTMLElement; @@ -349,6 +350,18 @@ export class MarcRichEditorComponent implements OnInit { evt.stopPropagation(); } + getSubfieldDomId(field, subfield) { + return 'subfield-' + field.tag+subfield[0] + '-' + subfield[2]; + } + + getSubfieldTabindex(field, subfield) { + const subfieldGroupElement = document.getElementById(this.getSubfieldDomId(field, subfield)) as HTMLElement; + if (subfieldGroupElement?.contains(document.activeElement)) { + return -1; + } + return 0; + } + focusSubfieldGroup(field: MarcField, subfield: MarcSubfield) { // set lastFocused to subfield group for undo/redo purposes, // but do not emit a focus request ----------------------------------------------------------------------- Summary of changes: .../share/marc-edit/editable-content.component.html | 1 + .../src/app/staff/share/marc-edit/editor-context.ts | 20 ++++++++------------ .../staff/share/marc-edit/rich-editor.component.html | 8 ++++---- .../staff/share/marc-edit/rich-editor.component.ts | 13 +++++++++++++ 4 files changed, 26 insertions(+), 16 deletions(-) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. fd7e175ec053058ec0e24adbd7f3aec8f2dfe197
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_13 has been updated via fd7e175ec053058ec0e24adbd7f3aec8f2dfe197 (commit) from f91846eb2e21aa91a263d6c4beb1c47576520f9c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit fd7e175ec053058ec0e24adbd7f3aec8f2dfe197 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index e0aad070ba..3dbdca5839 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -210,6 +210,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_14 updated. 8e64a75b9dd259eba55f350802ffb821700b09dd
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_14 has been updated via 8e64a75b9dd259eba55f350802ffb821700b09dd (commit) from 79c5da33f60b8ee63abc7892c5b8f0a2a75fcabe (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8e64a75b9dd259eba55f350802ffb821700b09dd Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1728ed645f..4f39697306 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -210,6 +210,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_15 updated. 21f7dddd8377d6173f2038180a052fd903ffafa0
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_15 has been updated via 21f7dddd8377d6173f2038180a052fd903ffafa0 (commit) from ea8ae780dbc842f75c78ac858723427d8c03a958 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 21f7dddd8377d6173f2038180a052fd903ffafa0 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1c0c58da05..655156c8bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,6 +214,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch main updated. 7e312a090065fb7f96ae0fb79861e16e169fdde4
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, main has been updated via 7e312a090065fb7f96ae0fb79861e16e169fdde4 (commit) from 750bc317aa3a20247b1e9f6b7cba701a4e94b10c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7e312a090065fb7f96ae0fb79861e16e169fdde4 Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Tue Mar 11 15:03:40 2025 +0000 LP2101886 MARC editor: allow right arrow in inputs In the MARC rich editor, the right arrow key is used to move from a selected subfield group to the first input in the group (the subfield code). This event listener was not specific enough, so that people using the right arrow key within a text input to move the cursor would unexpectedly find their focus moved backwards to the subfield code of the field data they were trying to edit. We now check whether the event target is an input or textarea field before moving focus. Release-note: Right arrow in MARC subfield data no longer moves focus Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Llewellyn Marshall <llewellyn.marshall(a)dncr.nc.gov> Signed-off-by: Terran McCanna <tmccanna(a)georgialibraries.org> diff --git a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts index 1c0c58da05..655156c8bb 100644 --- a/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts @@ -214,6 +214,13 @@ export class MarcRichEditorComponent implements OnInit { onKeyDown(evt: KeyboardEvent, field: MarcField, subfield?: MarcSubfield) { switch (evt.key) { case 'ArrowRight': + // console.debug("ArrowRight: ", evt, field, subfield); + let el = evt.target as HTMLElement; + // do nothing if we are in a text input + if (el.nodeName && (el.nodeName.toLowerCase() === 'input' || el.nodeName.toLowerCase() === 'textarea')) { + return; + } + // otherwise, move focus from the group to its first input (the subfield code) evt.preventDefault(); evt.stopPropagation(); this.context.focusSubfield(field, subfield[2], false); ----------------------------------------------------------------------- Summary of changes: .../src/eg2/src/app/staff/share/marc-edit/rich-editor.component.ts | 7 +++++++ 1 file changed, 7 insertions(+) hooks/post-receive -- Evergreen ILS

1 0

[GIT] Evergreen ILS branch rel_3_13 updated. f91846eb2e21aa91a263d6c4beb1c47576520f9c
by Git User 07 Apr '25

07 Apr '25

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Evergreen ILS". The branch, rel_3_13 has been updated via f91846eb2e21aa91a263d6c4beb1c47576520f9c (commit) from cd6f36548152cab1203bbb9dcd64aab9bded6fc2 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit f91846eb2e21aa91a263d6c4beb1c47576520f9c Author: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Date: Sat Mar 15 21:54:08 2025 +0000 LP1940867 Avoid error when reimporting vandelay queue Avoids checking nonexistent combobox freetext value when reimporting Vandelay queue. Release-note: Avoid freetext error when reimporting MARC import queue Signed-off-by: Stephanie Leary <stephanie.leary(a)equinoxoli.org> Signed-off-by: Jane Sandberg <sandbergja(a)gmail.com> diff --git a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts index c7b6474842..902d1e1635 100644 --- a/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts +++ b/Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts @@ -472,7 +472,7 @@ export class ImportComponent implements OnInit, AfterViewInit, OnDestroy { // Extract selected queue ID or create a new queue when requested. resolveQueue(): Promise<number> { - if (this.selectedQueue.freetext) { + if (this.selectedQueue?.freetext) { // Free text queue selector means create a new entry. // TODO: first check for name dupes ----------------------------------------------------------------------- Summary of changes: Open-ILS/src/eg2/src/app/staff/cat/vandelay/import.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Evergreen ILS

1 0