From 9f44738eace7bac13199d1027fc7e80f0d709586 Mon Sep 17 00:00:00 2001 From: Robert von Burg Date: Mon, 30 Aug 2021 21:04:29 +0200 Subject: [PATCH] [Major] Updated code to work with strolch-wc-information-dialog 0.1.3 --- .../src/main/webapp/app/src/c-app-behavior.html | 8 +++++--- .../archetype-resources/src/main/webapp/bower.json | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/c-app-behavior.html b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/c-app-behavior.html index b71930793..fa597321a 100644 --- a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/c-app-behavior.html +++ b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/app/src/c-app-behavior.html @@ -86,8 +86,9 @@ title: 'serverNotAvailable', line1: 'serverNotAvailableMsg', cancelable: false, - callback: function () { - this.reconnect(); + callback: function (confirmed) { + if (confirmed) + this.reconnect(); }.bind(this) }); }, @@ -99,7 +100,8 @@ title: 'sessionInvalid', line1: 'sessionInvalidConfirmNavToLogin', cancelable: false, - callback: function () { + callback: function (confirmed) { + if (!confirmed) return; this.deleteCookie('strolch.authorization'); this.set("authTokenValid", false); }.bind(this) diff --git a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/bower.json b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/bower.json index 8fd50ce82..cf6abd18b 100644 --- a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/bower.json +++ b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/main/webapp/bower.json @@ -10,7 +10,7 @@ "strolch-wc-auth": "strolch-li/strolch-wc-auth#^0.9.2", "strolch-wc-inspector": "strolch-li/strolch-wc-inspector#^0.22.2", "strolch-wc-localize-behavior": "strolch-li/strolch-wc-localize-behavior#^1.1.11", - "strolch-wc-information-dialog": "strolch-li/strolch-wc-information-dialog#^0.1.2", + "strolch-wc-information-dialog": "strolch-li/strolch-wc-information-dialog#^0.1.3", "strolch-wc-reports": "strolch-li/strolch-wc-reports#^0.2.12", "strolch-wc-paging": "strolch-li/strolch-wc-paging#^0.1.4", "strolch-wc-ws-observer": "strolch-li/strolch-wc-ws-observer#^0.2.7",