From 91714eb8b3f4e11d887df92d942db5c6defbb0d9 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Wed, 24 Nov 2021 11:50:54 +0100
Subject: [PATCH] [New] Close of confirmation dialog also possible with
 closeable=true

---
 bower.json                         |  2 +-
 strolch-wc-information-dialog.html | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/bower.json b/bower.json
index d1ef775..ff7311f 100644
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "strolch-wc-information-dialog",
   "description": "Strolch WebComponent Information Dialog",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "authors": [
     "Robert von Burg"
   ],
diff --git a/strolch-wc-information-dialog.html b/strolch-wc-information-dialog.html
index 50ba8e7..4a18d16 100644
--- a/strolch-wc-information-dialog.html
+++ b/strolch-wc-information-dialog.html
@@ -34,9 +34,12 @@
             <div class="buttons">
                 <template is="dom-if" if="[[confirmation]]">
                     <template is="dom-if" if="[[cancelable]]">
-                        <paper-button on-tap="_onClose">[[cancelLbl]]</paper-button>
+                        <paper-button on-tap="_onCancel">[[cancelLbl]]</paper-button>
                     </template>
                     <paper-button autofocus on-tap="_onOk">[[okLbl]]</paper-button>
+                    <template is="dom-if" if="[[closeable]]">
+                        <paper-button autofocus on-tap="_onClose">[[closeLbl]]</paper-button>
+                    </template>
                 </template>
                 <template is="dom-if" if="[[!confirmation]]">
                     <paper-button autofocus on-tap="_onClose">[[closeLbl]]</paper-button>
@@ -87,6 +90,10 @@
                     type: Boolean,
                     value: true
                 },
+                closeable: {
+                    type: Boolean,
+                    value: false
+                },
                 callback: {
                     type: Function,
                     value: null
@@ -100,6 +107,10 @@
             observers: [],
 
             _onClose: function () {
+                this.close();
+            },
+
+            _onCancel: function () {
                 if (this.confirmation) {
                     this._confirm(false);
                 } else {
@@ -181,7 +192,8 @@
                     this.confirmation = true;
                 }
 
-                this.cancelable = typeof data.cancelable === "boolean" ? data.cancelable : true;
+                this.cancelable = typeof data.cancelable === "boolean" && data.cancelable;
+                this.closeable = typeof data.closeable === "boolean" && data.closeable;
 
                 console.log("Message: " + this.title + ': ' + this.line1);
                 this.$.dlg.notifyResize();