From 12db51a3771ae4008636854e963fa6de347f3c78 Mon Sep 17 00:00:00 2001 From: CarlNation Date: Tue, 12 Apr 2022 09:12:24 -0400 Subject: [PATCH] CSR-478 relocate keydown logic to footer --- src/common-components/funnel-footer/funnel-footer.vue | 6 ++++++ src/layouts/vehicle-damage/vehicle-damage.spec.js | 1 - src/layouts/vehicle-damage/vehicle-damage.vue | 2 -- src/mixins/base-mixin.js | 5 ----- src/router/index.js | 2 -- 5 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/common-components/funnel-footer/funnel-footer.vue b/src/common-components/funnel-footer/funnel-footer.vue index cea6b403e..8892d70a1 100644 --- a/src/common-components/funnel-footer/funnel-footer.vue +++ b/src/common-components/funnel-footer/funnel-footer.vue @@ -70,6 +70,9 @@ export default { beforeUnmount() { window.removeEventListener('resize', this.onResize); }, + unmounted() { + document.onkeydown = null; + }, computed: { backLink(){ return this.getCmsContent(this.cmsWidgetName, 'BackButtonText'); @@ -89,6 +92,9 @@ export default { this.$refs.buttonMain.removeLoader(); }, buttonClick() { + document.onkeydown = function (e) { + return false; + }; this.$emit("ForwardClicked"); }, linkClick() { diff --git a/src/layouts/vehicle-damage/vehicle-damage.spec.js b/src/layouts/vehicle-damage/vehicle-damage.spec.js index 282c30d86..fe3a4aa51 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.spec.js +++ b/src/layouts/vehicle-damage/vehicle-damage.spec.js @@ -814,7 +814,6 @@ function setupMocks({ damageLocationQuestion.methods.initializeComponent; wrapper.vm.setCmsContent = baseMixin.methods.setCmsContent; - wrapper.vm.blockKeyDownInputFromKeyboard = baseMixin.methods.blockKeyDownInputFromKeyboard; return { wrapper, apiPromise }; } diff --git a/src/layouts/vehicle-damage/vehicle-damage.vue b/src/layouts/vehicle-damage/vehicle-damage.vue index e5fd04523..be071a76a 100644 --- a/src/layouts/vehicle-damage/vehicle-damage.vue +++ b/src/layouts/vehicle-damage/vehicle-damage.vue @@ -258,8 +258,6 @@ export default { }, async forwardButtonAction() { - this.blockKeyDownInputFromKeyboard(); - store.commit(this.storeMutations.UPDATE_IS_REPAIR, this.isWindshieldRepair); if (this.isWindshieldRepair){ diff --git a/src/mixins/base-mixin.js b/src/mixins/base-mixin.js index 6b3658089..b5a954c43 100644 --- a/src/mixins/base-mixin.js +++ b/src/mixins/base-mixin.js @@ -25,11 +25,6 @@ export default { return store.dispatch(type, payload); }, - blockKeyDownInputFromKeyboard(){ - document.onkeydown = function (e) { - return false; - }; - }, savePageDataToStore(page, data){ store.commit(storeMutations.UPDATE_PAGE_DATA, { page: page, data: data }); }, diff --git a/src/router/index.js b/src/router/index.js index 1caa4f3af..778c55cfc 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -34,8 +34,6 @@ const routes = [ path: "/", name: "root", async beforeEnter(to, from, next) { - document.onkeydown = null; - // If we have no query string, or we don't have the FmgPage query string. if (to.query.fmgPage === undefined) { await GoToFunnelStartOn404(next);