Merge pull request #51 from unicef-polymer/develop

Develop
unicef-polymer · Nov 1, 2018 · 4fdeff7 · 4fdeff7
2 parents befe7f0 + 44fd6c5
commit 4fdeff7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "etools-dialog",
   "description": "Simple dialog element",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "license": "https://github.com/unicef-polymer/etools-dialog/blob/master/LICENSE.md",
   "main": "etools-dialog.html",
   "dependencies": {

diff --git a/etools-dialog.html b/etools-dialog.html
@@ -166,7 +166,7 @@
                   on-iron-overlay-opened="_dialogOpenedHandling"
                   no-auto-focus="[[noAutoFocus]]"
                   on-dom-change="_onDomChange">
-      <paper-icon-button icon="close" dialog-dismiss class="close-btn"></paper-icon-button>
+      <paper-icon-button icon="close" dialog-dismiss class="close-btn" disabled="[[disableDismissBtn]]"></paper-icon-button>
       <h2 class="dialog-title">[[dialogTitle]]</h2>
 
       <paper-dialog-scrollable class$="relative no-padding [[getScrollableDialogClass(noPadding)]]">
@@ -176,7 +176,7 @@ <h2 class="dialog-title">[[dialogTitle]]</h2>
       </paper-dialog-scrollable>
 
       <div class="buttons">
-        <paper-button dialog-dismiss class="cancel-btn">[[cancelBtnText]]</paper-button>
+        <paper-button dialog-dismiss class="cancel-btn" disabled="[[disableDismissBtn]]">[[cancelBtnText]]</paper-button>
         <paper-button dialog-confirm$="[[!keepDialogOpen]]" on-tap="_confirmBtClicked" autofocus
                       disabled="{{disableConfirmBtn}}"
                       hidden="[[hideConfirmBtn]]"
@@ -241,6 +241,10 @@ <h2 class="dialog-title">[[dialogTitle]]</h2>
             type: Boolean,
             value: false
           },
+          disableDismissBtn: {
+            type: Boolean,
+            value: false
+          },
           hideConfirmBtn: {
             type: Boolean,
             value: false,