Merge e33aefb into d51c06e

uiv-lib · Nov 8, 2019 · c0ab313 · c0ab313
2 parents d51c06e + e33aefb
commit c0ab313
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/src/components/modal/Modal.vue b/src/components/modal/Modal.vue
@@ -1,5 +1,5 @@
 <template>
-  <div tabindex="-1" role="dialog" class="modal" :class="{fade:transitionDuration>0}" @click.self="backdropClicked">
+  <div tabindex="-1" role="dialog" class="modal" :class="{fade:transitionDuration>0}" @mousedown.self="backdropClicked">
     <div ref="dialog" class="modal-dialog" :class="modalSizeClass" role="document">
       <div class="modal-content">
         <div class="modal-header" v-if="header">

diff --git a/test/specs/MessageBox.spec.js b/test/specs/MessageBox.spec.js
@@ -279,6 +279,8 @@ describe('MessageBox', () => {
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).to.exist
     expect(document.querySelector('.modal').className).to.contain('in')
+    utils.triggerEvent(document.querySelector('.modal'), 'mousedown')
+    utils.triggerEvent(document.querySelector('.modal'), 'mouseup')
     utils.triggerEvent(document.querySelector('.modal'), 'click')
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).not.exist

diff --git a/test/specs/Modal.spec.js b/test/specs/Modal.spec.js
@@ -379,6 +379,8 @@ describe('Modal', () => {
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).to.exist
     expect(modal.className).to.contain('in')
+    utils.triggerEvent(modal, 'mousedown')
+    utils.triggerEvent(modal, 'mouseup')
     utils.triggerEvent(modal, 'click')
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).not.exist
@@ -395,6 +397,8 @@ describe('Modal', () => {
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).to.exist
     expect(modal.className).to.contain('in')
+    utils.triggerEvent(modal, 'mousedown')
+    utils.triggerEvent(modal, 'mouseup')
     utils.triggerEvent(modal, 'click')
     await utils.sleep(utils.transitionDuration)
     expect(document.querySelector('.modal-backdrop')).to.exist