From b9bd4d2b8f16e524b11aef71e4d2e5ac16c4a545 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20=C5=A0ediv=C3=BD?= Date: Fri, 18 Jun 2021 21:57:46 +0200 Subject: [PATCH] overlay fix naming. --- src/component/main.vue | 8 ++++---- src/component/overlay.vue | 28 ++++++++++++++-------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/component/main.vue b/src/component/main.vue index ad7d8349..b6cadf99 100644 --- a/src/component/main.vue +++ b/src/component/main.vue @@ -14,10 +14,10 @@ : '' " :implicitControl="state.control.implicit_hosting && state.sessions[state.session_id].profile.can_host" - @implicit-control-request="connection.websocket.send('control/request')" - @implicit-control-release="connection.websocket.send('control/release')" - @update-kbd-modifiers="updateKeyboardModifiers($event)" - @drop-files="uploadDrop($event)" + @implicitControlRequest="connection.websocket.send('control/request')" + @implicitControlRelease="connection.websocket.send('control/release')" + @updateKeyboardModifiers="updateKeyboardModifiers($event)" + @uploadDrop="uploadDrop($event)" /> diff --git a/src/component/overlay.vue b/src/component/overlay.vue index bddb1b96..21eafad2 100644 --- a/src/component/overlay.vue +++ b/src/component/overlay.vue @@ -284,7 +284,7 @@ this.focused = true if (this.isControling) { - this.updateKbdModifiers(e) + this.updateKeyboardModifiers(e) } } @@ -292,8 +292,8 @@ if (this.isControling) { this.keyboard.reset() - // save current kbd modifiers state - Vue.set(this, 'kbdModifiers', { + // save current keyboard modifiers state + Vue.set(this, 'keyboardModifiers', { capslock: e.getModifierState('CapsLock'), numlock: e.getModifierState('NumLock'), }) @@ -323,7 +323,7 @@ const files = await getFilesFromDataTansfer(dt) if (files.length === 0) return - this.$emit('drop-files', { ...this.getMousePos(e.clientX, e.clientY), files }) + this.$emit('uploadDrop', { ...this.getMousePos(e.clientX, e.clientY), files }) } } @@ -331,18 +331,18 @@ // keyboard modifiers // - private kbdModifiers: { capslock: boolean; numlock: boolean } | null = null + private keyboardModifiers: { capslock: boolean; numlock: boolean } | null = null - updateKbdModifiers(e: MouseEvent) { + updateKeyboardModifiers(e: MouseEvent) { const capslock = e.getModifierState('CapsLock') const numlock = e.getModifierState('NumLock') if ( - this.kbdModifiers === null || - this.kbdModifiers.capslock !== capslock || - this.kbdModifiers.numlock !== numlock + this.keyboardModifiers === null || + this.keyboardModifiers.capslock !== capslock || + this.keyboardModifiers.numlock !== numlock ) { - this.$emit('update-kbd-modifiers', { capslock, numlock }) + this.$emit('updateKeyboardModifiers', { capslock, numlock }) } } @@ -439,10 +439,10 @@ @Watch('isControling') onControlChange(isControling: boolean) { - Vue.set(this, 'kbdModifiers', null) + Vue.set(this, 'keyboardModifiers', null) if (isControling && this.reqMouseDown) { - this.updateKbdModifiers(this.reqMouseDown) + this.updateKeyboardModifiers(this.reqMouseDown) this.setMousePos(this.reqMouseDown) this.webrtc.send('mousedown', { key: this.reqMouseDown.button + 1 }) } @@ -464,7 +464,7 @@ implicitControlRequest(e: MouseEvent) { if (this.implicitControl && e.type === 'mousedown' && this.reqMouseDown == null) { this.reqMouseDown = e - this.$emit('implicit-control-request') + this.$emit('implicitControlRequest') } if (this.implicitControl && e.type === 'mouseup' && this.reqMouseUp == null) { @@ -475,7 +475,7 @@ // unused implicitControlRelease() { if (this.implicitControl) { - this.$emit('implicit-control-release') + this.$emit('implicitControlRelease') } } }