dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-05-03 08:13:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed multiple shortcuts handling #898

Browse Source
This commit is contained in:
Jan Prochazka
2024-09-25 09:10:54 +02:00
parent b63479bf45
commit 0c2579897f
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -13,7 +13,8 @@ Builds:
- ADDED: MySQL - specify table engine, show table engine in table list - ADDED: MySQL - specify table engine, show table engine in table list
- FIXED: Hidden primary key name in PK editor for DB engines with anonymous PK (MySQL) - FIXED: Hidden primary key name in PK editor for DB engines with anonymous PK (MySQL)
- CHANGED: Import/export dialog is now tab instead of modal - CHANGED: Import/export dialog is now tab instead of modal
- ADDED: Saving impor/export job - ADDED: Saving import/export job
- REMOVED: Ability to reopen export/import wizard from generated script. This was a bit hack, now you could save import/export job instead
- ADDED: Autodetect CSV delimited - ADDED: Autodetect CSV delimited
- FIXED: Import CSV files with spaces around quotes - FIXED: Import CSV files with spaces around quotes
- ADDED: JSON file import - ADDED: JSON file import
@@ -30,6 +31,7 @@ Builds:
- FIXED: (MySQL) Fixed importing SQL dump exported from mysqldump (#702) - FIXED: (MySQL) Fixed importing SQL dump exported from mysqldump (#702)
- FIXED: (PostgreSQL) Fixed filtering JSONB fields (#889) - FIXED: (PostgreSQL) Fixed filtering JSONB fields (#889)
- FIXED: OIDC authentication not working anymore (#891) - FIXED: OIDC authentication not working anymore (#891)
- ADDED: Added tests for import from CSV and JSON
### 5.4.4 ### 5.4.4
- CHANGED: Improved autoupdate, notification is now in app - CHANGED: Improved autoupdate, notification is now in app

18
packages/web/src/utility/common.ts
View File

@@ -62,21 +62,21 @@ export function isMac() {
export function formatKeyText(keyText: string): string { export function formatKeyText(keyText: string): string {
if (isMac()) { if (isMac()) {
return keyText return keyText
.replace('CtrlOrCommand+', '⌘ ') .replace(/CtrlOrCommand\+/g, '⌘ ')
.replace('Shift+', '⇧ ') .replace(/Shift\+/g, '⇧ ')
.replace('Alt+', '⌥ ') .replace(/Alt\+g/, '⌥ ')
.replace('Command+', '⌘ ') .replace(/Command\+/g, '⌘ ')
.replace('Ctrl+', '⌃ ') .replace(/Ctrl\+/g, '⌃ ')
.replace('Backspace', '⌫ '); .replace(/Backspace/g, '⌫ ');
} }
return keyText.replace('CtrlOrCommand+', 'Ctrl+'); return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
} }
export function resolveKeyText(keyText: string): string { export function resolveKeyText(keyText: string): string {
if (isMac()) { if (isMac()) {
return keyText.replace('CtrlOrCommand+', 'Command+'); return keyText.replace(/CtrlOrCommand\+/g, 'Command+');
} }
return keyText.replace('CtrlOrCommand+', 'Ctrl+'); return keyText.replace(/CtrlOrCommand\+/g, 'Ctrl+');
} }
export function isCtrlOrCommandKey(event) { export function isCtrlOrCommandKey(event) {