Merge branch 'master' of github.com:bootstrap-vue/bootstrap-vue

Pooya Parsa · Pooya Parsa · commit dda86dbc1149 · 2017-01-17T21:09:23.000+03:30
diff --git a/components/modal.vue b/components/modal.vue
@@ -68,7 +68,7 @@
           this._modalAnimation = setTimeout(() => {
             _this._body.classList.add('modal-open');
             _this.animateModal = true;
-            _this.$root.$emit('shown::modal')
+            _this.$root.$emit('shown::modal', this.id)
           }, (_this.fade) ? TRANSITION_DURATION : 0)
         }, 0)
       },
@@ -83,7 +83,7 @@
             _this._body.classList.remove('modal-open');
             // no hide the modal wrapper
             _this.$el.style.display = 'none';
-            _this.$root.$emit('hidden::modal')
+            _this.$root.$emit('hidden::modal', this.id)
           }, (_this.fade) ? TRANSITION_DURATION : 0)
         }, (_this.fade) ? TRANSITION_DURATION : 0)
       },
