Merge branch 'RED-7605' into 'master'
RED-7605: Fixed ctrl+f and f not working properly. See merge request redactmanager/red-ui!91
This commit is contained in:
commit
77a1491546
@ -21,7 +21,7 @@
|
||||
[parentId]="getValueCellId(index)"
|
||||
[saveTooltip]="'rss-dialog.actions.save' | translate"
|
||||
[value]="entry.value.value ?? entry.value.originalValue"
|
||||
[helpModeKey]="'scm_edit_DIALOG'"
|
||||
[attr.helpModeKey]="'scm_edit_DIALOG'"
|
||||
>
|
||||
<ng-container slot="editing">
|
||||
<iqser-circle-button
|
||||
|
||||
@ -399,7 +399,7 @@ export class FilePreviewScreenComponent
|
||||
this._changeRef.markForCheck();
|
||||
}
|
||||
|
||||
if (['f', 'F'].includes($event.key)) {
|
||||
if (['f', 'F'].includes($event.key) && !$event.ctrlKey) {
|
||||
// if you type in an input, don't toggle full-screen
|
||||
if ($event.target instanceof HTMLInputElement || $event.target instanceof HTMLTextAreaElement) {
|
||||
return;
|
||||
|
||||
@ -105,8 +105,10 @@ export class PdfViewer {
|
||||
focusSearch() {
|
||||
const iframeWindow = this.#instance.UI.iframeWindow;
|
||||
const input = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
|
||||
input.focus();
|
||||
input.select();
|
||||
if (input) {
|
||||
input.focus();
|
||||
input.select();
|
||||
}
|
||||
}
|
||||
|
||||
activateSearch() {
|
||||
@ -258,8 +260,8 @@ export class PdfViewer {
|
||||
#listenForCommandF() {
|
||||
this.#instance.UI.hotkeys.on('command+f, ctrl+f', e => {
|
||||
e.preventDefault();
|
||||
this.focusSearch();
|
||||
this.activateSearch();
|
||||
this.focusSearch();
|
||||
});
|
||||
}
|
||||
|
||||
@ -288,7 +290,9 @@ export class PdfViewer {
|
||||
|
||||
const inputElement = iframeWindow.document.getElementById('SearchPanel__input') as HTMLInputElement;
|
||||
|
||||
setTimeout(() => (inputElement.value = ''), 0);
|
||||
if (inputElement) {
|
||||
setTimeout(() => (inputElement.value = ''), 0);
|
||||
}
|
||||
|
||||
if (!event.detail.isVisible) {
|
||||
this.documentViewer.clearSearchResults();
|
||||
|
||||
@ -80,6 +80,7 @@ export const DISABLED_HOTKEYS = [
|
||||
'C',
|
||||
'E',
|
||||
'I',
|
||||
'F',
|
||||
'L',
|
||||
'N',
|
||||
'O',
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 6cb63fcf43fbbf522b847f57467156808bbe72a1
|
||||
Subproject commit 8d4a68f92cc74c54382ff898c39fab0cd8e0f72c
|
||||
Loading…
x
Reference in New Issue
Block a user