Remove `.modal-open` class after backdrop is hidden

Fixes #14274.
Fixes #14632.

diff --git a/js/modal.js b/js/modal.js
index d0426b01b6780ff2236b85acfffcf8f0d7a4d146..cef013a56f78e0e7c730e9644c252b1b3b09ecbd 100644 (file)
--- a/js/modal.js
+++ b/js/modal.js
@@ -107,9 +107,6 @@
 
     this.isShown = false
 
-    this.$body.removeClass('modal-open')
-
-    this.resetScrollbar()
     this.escape()
 
     $(document).off('focusin.bs.modal')
@@ -150,6 +147,8 @@
     var that = this
     this.$element.hide()
     this.backdrop(function () {
+      that.$body.removeClass('modal-open')
+      that.resetScrollbar()
       that.$element.trigger('hidden.bs.modal')
     })
   }