From f52d11a992d97412a9eb3f50a2d2bcfadf219c06 Mon Sep 17 00:00:00 2001 From: Grzegorz Czajkowski Date: Fri, 19 Jun 2020 12:55:40 +0200 Subject: [PATCH] (UIComponents) Fix double back action in Dialogs [Issue] N/A [Problem] User is navigated two pages backward adter click "back icon" in "Dialog -> General Dialog" or "Dialog -> Picker Dialogs". [Solution] Exclude ".ui-btn-icon-back" from calling "tau.history.back" since it already does it. Signed-off-by: Grzegorz Czajkowski --- examples/mobile/UIComponents/components/dialogs/dialog.js | 2 +- examples/mobile/UIComponents/components/dialogs/picker.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/mobile/UIComponents/components/dialogs/dialog.js b/examples/mobile/UIComponents/components/dialogs/dialog.js index cf5ac284b7..c217c4d9c8 100644 --- a/examples/mobile/UIComponents/components/dialogs/dialog.js +++ b/examples/mobile/UIComponents/components/dialogs/dialog.js @@ -1,6 +1,6 @@ (function (document, tau) { var page = document.getElementById("demo-dialog-page"), - buttons = document.querySelectorAll(".ui-btn"), + buttons = document.querySelectorAll(".ui-btn:not(.ui-btn-icon-back)"), progressPage = page.querySelector("#progressbar-dialog"), progressbar = page.querySelector("#progressbar"), progressPercent = page.querySelector("#percent"), diff --git a/examples/mobile/UIComponents/components/dialogs/picker.js b/examples/mobile/UIComponents/components/dialogs/picker.js index 94dbaebb24..f158d9d1b7 100644 --- a/examples/mobile/UIComponents/components/dialogs/picker.js +++ b/examples/mobile/UIComponents/components/dialogs/picker.js @@ -1,6 +1,6 @@ (function (document, tau) { var page = document.getElementById("demo-picker-page"), - buttons = document.querySelectorAll(".ui-btn"), + buttons = document.querySelectorAll(".ui-btn:not(.ui-btn-icon-back)"), idx; function onClick() {