From 5d3a01be4b0d10c69f0ab468f907b12b5c25dfe6 Mon Sep 17 00:00:00 2001 From: Nico Lachmuth Date: Sun, 14 Jul 2019 16:07:53 +0200 Subject: [PATCH 1/3] fix(hardwareBackButton): added missing import of hardware back button (ionic-team#18792) --- core/src/components/app/app.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index 9568f015677..6f6670160bb 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -24,6 +24,9 @@ export class App implements ComponentInterface { if (config.getBoolean('inputShims', needInputShims())) { import('../../utils/input-shims/input-shims').then(module => module.startInputShims(config)); } + if(config.getBoolean('hardwareBackButton', isPlatform(window, 'hybrid'))) { + import('../../utils/hardware-back-button').then(module => module.startHardwareBackButton()); + } import('../../utils/focus-visible').then(module => module.startFocusVisible()); }); From e906fc526624825c83dd9d87ea518639c326b66b Mon Sep 17 00:00:00 2001 From: Manu MA Date: Wed, 17 Jul 2019 17:37:43 +0200 Subject: [PATCH 2/3] Update app.tsx --- core/src/components/app/app.tsx | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index 6f6670160bb..2b9e024dba8 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -15,17 +15,18 @@ export class App implements ComponentInterface { componentDidLoad() { rIC(() => { + const isHybrid = isPlatform(window, 'hybrid'); if (!config.getBoolean('_testing')) { import('../../utils/tap-click').then(module => module.startTapClick(config)); } - if (config.getBoolean('statusTap', isPlatform(window, 'hybrid'))) { + if (config.getBoolean('statusTap', isHybrid)) { import('../../utils/status-tap').then(module => module.startStatusTap()); } if (config.getBoolean('inputShims', needInputShims())) { import('../../utils/input-shims/input-shims').then(module => module.startInputShims(config)); } - if(config.getBoolean('hardwareBackButton', isPlatform(window, 'hybrid'))) { - import('../../utils/hardware-back-button').then(module => module.startHardwareBackButton()); + if(config.getBoolean('hardwareBackButton', isHybrid)) { + import('../../utils/hardware-back-button').then(module => module.startHardwareBackButton()); } import('../../utils/focus-visible').then(module => module.startFocusVisible()); From 3ebd202a7132770dc53f8ec8c372af2474914296 Mon Sep 17 00:00:00 2001 From: Manu MA Date: Wed, 17 Jul 2019 17:41:02 +0200 Subject: [PATCH 3/3] Update app.tsx --- core/src/components/app/app.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/components/app/app.tsx b/core/src/components/app/app.tsx index 2b9e024dba8..8f2a2a95073 100644 --- a/core/src/components/app/app.tsx +++ b/core/src/components/app/app.tsx @@ -25,7 +25,7 @@ export class App implements ComponentInterface { if (config.getBoolean('inputShims', needInputShims())) { import('../../utils/input-shims/input-shims').then(module => module.startInputShims(config)); } - if(config.getBoolean('hardwareBackButton', isHybrid)) { + if (config.getBoolean('hardwareBackButton', isHybrid)) { import('../../utils/hardware-back-button').then(module => module.startHardwareBackButton()); } import('../../utils/focus-visible').then(module => module.startFocusVisible());