Browse Source

fixed modal show and hide with right name

bach 3 years ago
parent
commit
9e99c4c688

File diff suppressed because it is too large
+ 0 - 0
web/themes/custom/materiotheme/assets/dist/main.js


+ 1 - 0
web/themes/custom/materiotheme/vuejs/components/Content/Card.vue

@@ -127,6 +127,7 @@ export default {
           ModalCard,
           { item: this.item },
           {
+            name: `modal-${this.item.id}`,
             draggable: true,
             width: '850px',
             height: '610px'

+ 2 - 1
web/themes/custom/materiotheme/vuejs/components/Content/LinkedMaterialCard.vue

@@ -65,7 +65,8 @@ export default {
           ModalCard,
           { item: this.item },
           {
-            draggable: true,
+            name: `modal-${this.item.id}`,
+            draggable: false,
             width: '850px',
             height: '610px'
           }

+ 2 - 1
web/themes/custom/materiotheme/vuejs/components/Content/ModalCard.vue

@@ -177,7 +177,8 @@ export default {
       }
     },
     onCloseModalCard (e) {
-      this.$modal.hideAll()
+      // this.$modal.hideAll()
+      this.$modal.hide(`modal-${this.item.id}`)
     }
   }
 }

Some files were not shown because too many files changed in this diff