use fallback target.id - only scroll modal content (not the page)

HabitRPG · Jul 1, 2018 · f8d8d4f · f8d8d4f
1 parent c072935
commit f8d8d4f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/website/client/app.vue b/website/client/app.vue
@@ -105,7 +105,7 @@ div
   @import '~client/assets/scss/colors.scss';
 
   /* @TODO: The modal-open class is not being removed. Let's try this for now */
-  .modal, .modal-open {
+  .modal {
     overflow-y: scroll !important;
   }
 
@@ -475,7 +475,14 @@ export default {
       });
 
       this.$root.$on('bv::modal::hidden', (bvEvent) => {
-        const modalId = bvEvent.target && bvEvent.target.id;
+
+        let modalId = bvEvent.target && bvEvent.target.id;
+
+        // sometimes the target isn't passed to the hidden event, fallback is the vueTarget
+        if (!modalId) {
+          modalId = bvEvent.vueTarget && bvEvent.vueTarget.id;
+        }
+
         if (!modalId) return;
 
         const modalStack = this.$store.state.modalStack;