From d918407674c4bdc6e7e3707bb2063c6ff878fd4e Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Tue, 26 Mar 2024 12:22:24 -0500 Subject: [PATCH 1/4] wip author message fix for non-preview vieweer --- src/mobile/pages/pages-vm.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/mobile/pages/pages-vm.js b/src/mobile/pages/pages-vm.js index ca96197a..b0a877f4 100644 --- a/src/mobile/pages/pages-vm.js +++ b/src/mobile/pages/pages-vm.js @@ -368,6 +368,11 @@ export default DefineMap.extend('PagesVM', { return // these buttons skip rest of navigate } + if (button.next === constants.qMESSAGE){ + vm.handleMessage(button,vm) + return + } + vm.handleCodeAfter(button, vm, page, logic) // afterLogic fired, but GOTO resolves later vm.setRepeatVariable(button) // set counting variables if exist @@ -568,6 +573,14 @@ export default DefineMap.extend('PagesVM', { } }, + handleMessage(button, ev){ + ev && ev.preventDefault() + this.appState.modalContent = { + title: 'Author note:', + text: button.message || 'You have completed this A2J Guided Interview. Please close your browser window to exit.' + } + }, + handlePreviewResponses (button, ev) { ev && ev.preventDefault() switch (button.next) { @@ -613,6 +626,7 @@ export default DefineMap.extend('PagesVM', { break } }, + /** Track special button clicks in Matomo analytics * @param button button id */ From 8da88117c1b3d9d9da468a9942cf225ebfdbb8b7 Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Tue, 26 Mar 2024 12:31:33 -0500 Subject: [PATCH 2/4] cleanup --- src/mobile/pages/pages-vm.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mobile/pages/pages-vm.js b/src/mobile/pages/pages-vm.js index b0a877f4..64758a4d 100644 --- a/src/mobile/pages/pages-vm.js +++ b/src/mobile/pages/pages-vm.js @@ -368,8 +368,8 @@ export default DefineMap.extend('PagesVM', { return // these buttons skip rest of navigate } - if (button.next === constants.qMESSAGE){ - vm.handleMessage(button,vm) + if (button.next === constants.qMESSAGE) { + vm.handleMessage(button, vm) return } @@ -573,7 +573,7 @@ export default DefineMap.extend('PagesVM', { } }, - handleMessage(button, ev){ + handleMessage (button, ev) { ev && ev.preventDefault() this.appState.modalContent = { title: 'Author note:', From 556db6a24bb5f8669a10716fe3b85f5c6f8daffe Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Tue, 26 Mar 2024 13:12:58 -0500 Subject: [PATCH 3/4] cleanup --- demo/viewer/viewer.html | 4 ++-- index.dev.html | 2 +- index.html | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/demo/viewer/viewer.html b/demo/viewer/viewer.html index db4abf2c..4e212c0d 100644 --- a/demo/viewer/viewer.html +++ b/demo/viewer/viewer.html @@ -53,9 +53,9 @@ diff --git a/index.dev.html b/index.dev.html index 400bc7b4..ee262ea9 100644 --- a/index.dev.html +++ b/index.dev.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/index.html b/index.html index ee262ea9..680a32e0 100644 --- a/index.html +++ b/index.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file From c475e67427f40358514e424f892708648470a18b Mon Sep 17 00:00:00 2001 From: Tobias Nteireho Date: Tue, 26 Mar 2024 13:16:21 -0500 Subject: [PATCH 4/4] properly pass event --- demo/viewer/viewer.html | 4 ++-- index.dev.html | 2 +- index.html | 2 +- src/mobile/pages/pages-vm.js | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/demo/viewer/viewer.html b/demo/viewer/viewer.html index 4e212c0d..4eca491b 100644 --- a/demo/viewer/viewer.html +++ b/demo/viewer/viewer.html @@ -53,9 +53,9 @@ diff --git a/index.dev.html b/index.dev.html index ee262ea9..680a32e0 100644 --- a/index.dev.html +++ b/index.dev.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/index.html b/index.html index 680a32e0..83ac929a 100644 --- a/index.html +++ b/index.html @@ -59,6 +59,6 @@ errRepURL: '' })); - + \ No newline at end of file diff --git a/src/mobile/pages/pages-vm.js b/src/mobile/pages/pages-vm.js index 64758a4d..c16bb619 100644 --- a/src/mobile/pages/pages-vm.js +++ b/src/mobile/pages/pages-vm.js @@ -369,7 +369,7 @@ export default DefineMap.extend('PagesVM', { } if (button.next === constants.qMESSAGE) { - vm.handleMessage(button, vm) + vm.handleMessage(button, ev) return }