chiu
/
patch_file
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'revert-f94053dd' into 'master' 

Revert "fix bootstrap error"

This reverts commit f94053dd3a

See merge request !1
This commit is contained in:
chiu 2020-05-19 15:19:13 +08:00
parent 039b3942fc 6a9bc2cc7e
commit 923fa39288
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
updatefiles/javascripts/basic/bootstrap.js vendored
View File

@ -948,10 +948,9 @@ if (typeof jQuery === 'undefined') {
Modal.prototype.show = function (_relatedTarget) { Modal.prototype.show = function (_relatedTarget) {
var that = this var that = this
var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget }) var e = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
var e_old = $.Event('shown', { relatedTarget: _relatedTarget })
this.$element.trigger(e) this.$element.trigger(e)
this.$element.trigger(e_old)
if (this.isShown || e.isDefaultPrevented()) return if (this.isShown || e.isDefaultPrevented()) return
this.isShown = true this.isShown = true

2
updatefiles/javascripts/bootstrap.min.js vendored
View File

File diff suppressed because one or more lines are too long