Skip to content
GitLab
Commit 36ebec5e authored by Heinrich Fenkart's avatar Heinrich Fenkart
Browse files

grunt

parent acf3c0bf
4 merge requests!28721Hot test,!16605Test pull please ignore,!22103test,!25326Adjust examples
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 8 additions and 10 deletions
+8 -10
dist/js/bootstrap.js
+ 2
- 3
View file @ 36ebec5e
...@@ -953,9 +953,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -953,9 +953,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.isShown = false this.isShown = false
this.$body.removeClass('modal-open')
this.resetScrollbar()
this.escape() this.escape()
$(document).off('focusin.bs.modal') $(document).off('focusin.bs.modal')
...@@ -996,6 +993,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -996,6 +993,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var that = this var that = this
this.$element.hide() this.$element.hide()
this.backdrop(function () { this.backdrop(function () {
that.$body.removeClass('modal-open')
that.resetScrollbar()
that.$element.trigger('hidden.bs.modal') that.$element.trigger('hidden.bs.modal')
}) })
} }
......
dist/js/bootstrap.min.js
+ 1
- 1
View file @ 36ebec5e
This diff is collapsed.
docs/assets/js/customize.min.js
+ 1
- 1
View file @ 36ebec5e
This diff is collapsed.
docs/assets/js/raw-files.min.js
+ 1
- 1
View file @ 36ebec5e
This diff is collapsed.
docs/dist/js/bootstrap.js
+ 2
- 3
View file @ 36ebec5e
...@@ -953,9 +953,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -953,9 +953,6 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
this.isShown = false this.isShown = false
this.$body.removeClass('modal-open')
this.resetScrollbar()
this.escape() this.escape()
$(document).off('focusin.bs.modal') $(document).off('focusin.bs.modal')
...@@ -996,6 +993,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re ...@@ -996,6 +993,8 @@ if (typeof jQuery === 'undefined') { throw new Error('Bootstrap\'s JavaScript re
var that = this var that = this
this.$element.hide() this.$element.hide()
this.backdrop(function () { this.backdrop(function () {
that.$body.removeClass('modal-open')
that.resetScrollbar()
that.$element.trigger('hidden.bs.modal') that.$element.trigger('hidden.bs.modal')
}) })
} }
......
docs/dist/js/bootstrap.min.js
+ 1
- 1
View file @ 36ebec5e
This diff is collapsed.
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment