Merge branch 'revert-f94053dd' into 'master'

Revert "fix bootstrap error" This reverts commit f94053dd3a See merge request !1
2020-05-19 15:19:13 +08:00 · 2020-05-19 15:19:13 +08:00 · 923fa39288
parent 039b3942fc 6a9bc2cc7e
commit 923fa39288
2 changed files with 2 additions and 3 deletions
--- a/updatefiles/javascripts/basic/bootstrap.js
+++ b/updatefiles/javascripts/basic/bootstrap.js
@ -948,10 +948,9 @@ if (typeof jQuery === 'undefined') {
  Modal.prototype.show = function (_relatedTarget) {
    var that = this
    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
-    var e_old = $.Event('shown', { relatedTarget: _relatedTarget })

    this.$element.trigger(e)
-    this.$element.trigger(e_old)
+
    if (this.isShown || e.isDefaultPrevented()) return

    this.isShown = true
--- a/updatefiles/javascripts/bootstrap.min.js
+++ b/updatefiles/javascripts/bootstrap.min.js