Merge branch 'modal-flag' into 'master'

Modal flag See merge request mistio/mist-list!34
mistio · Oct 11, 2019 · ee74750 · ee74750
2 parents 8e954d2 + cd9d720
commit ee74750
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "mist-list",
-  "version": "2.1.2",
+  "version": "2.1.3",
   "authors": [
     "Dimitris Moraitis <[email protected]>",
     "Christina Papakonstantinou <[email protected]>"

diff --git a/mist-list-actions-behavior.html b/mist-list-actions-behavior.html
@@ -85,7 +85,7 @@
       console.log(event.detail);
       dialogs = this.shadowRoot.querySelectorAll('vaadin-dialog') || [];
       for (var i = 0; i < dialogs.length; i++) {
-        if (dialogs[i].opened) {
+        if (dialogs[i].opened && !this.modal) {
           var overlay = dialogs[i].$.overlay.$.overlay,
             overlayShadowRoot = overlay.querySelector('#content').shadowRoot,
             confirmButton = overlayShadowRoot.querySelector('paper-button[dialog-confirm]');