diff --git a/bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue b/bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue index dc7dd38d0d..e767aeef5f 100644 --- a/bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/developer/widgets/widget-edit.vue @@ -171,7 +171,7 @@ export default { } }, keyDown (ev) { - if (ev.ctrlKey || ev.metaKey) { + if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { switch (ev.keyCode) { case 80: this.widgetPropsOpened = true diff --git a/bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue index 5ccd091d09..b6db0ba5b8 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/items/item-edit.vue @@ -127,7 +127,7 @@ export default { } }, keyDown (ev) { - if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey)) { + if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { this.save() ev.stopPropagation() ev.preventDefault() diff --git a/bundles/org.openhab.ui/web/src/pages/settings/pages/pagedesigner-mixin.js b/bundles/org.openhab.ui/web/src/pages/settings/pages/pagedesigner-mixin.js index d6fa05f034..e935277f08 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/pages/pagedesigner-mixin.js +++ b/bundles/org.openhab.ui/web/src/pages/settings/pages/pagedesigner-mixin.js @@ -83,7 +83,7 @@ export default { this.$store.dispatch('stopTrackingStates') }, keyDown (ev) { - if (ev.ctrlKey || ev.metaKey) { + if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { switch (ev.keyCode) { case 82: this.togglePreviewMode() diff --git a/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue index 375227f29d..8a15391092 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/pages/sitemap/sitemap-edit.vue @@ -261,7 +261,7 @@ export default { this.detailsOpened = false }, keyDown (ev) { - if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey)) { + if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { this.save(!this.createMode) ev.stopPropagation() ev.preventDefault() diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue index c2ff359d97..5641c2f562 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/rule-edit.vue @@ -406,7 +406,7 @@ export default { this.eventSource = null }, keyDown (ev) { - if (ev.ctrlKey || ev.metaKey) { + if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { if (this.currentModule) return switch (ev.keyCode) { case 68: diff --git a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue index 855f70174f..7e658f0fbc 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/rules/script/script-edit.vue @@ -393,7 +393,7 @@ export default { this.eventSource = null }, keyDown (ev) { - if (ev.ctrlKey || ev.metaKey) { + if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { switch (ev.keyCode) { case 66: if (this.isBlockly) { diff --git a/bundles/org.openhab.ui/web/src/pages/settings/services/service-settings.vue b/bundles/org.openhab.ui/web/src/pages/settings/services/service-settings.vue index c55835ebda..f5eb39c37f 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/services/service-settings.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/services/service-settings.vue @@ -81,7 +81,7 @@ export default { } }, keyDown (ev) { - if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey)) { + if (ev.keyCode === 83 && (ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { this.save() ev.stopPropagation() ev.preventDefault() diff --git a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue index 6a6133e3ad..a536206afc 100644 --- a/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue +++ b/bundles/org.openhab.ui/web/src/pages/settings/things/thing-details.vue @@ -505,7 +505,7 @@ export default { }) }, keyDown (ev) { - if (ev.ctrlKey || ev.metaKey) { + if ((ev.ctrlKey || ev.metaKey) && !(ev.altKey || ev.shiftKey)) { switch (ev.keyCode) { case 68: this.toggleDisabled()