Skip to content

Commit

Permalink
Changed: Added null-check for removed elements during Tooltip.destroy()
Browse files Browse the repository at this point in the history
  • Loading branch information
Savas Ziplies committed Aug 2, 2017
1 parent 5d6b2eb commit 8cf804b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions assets/javascripts/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -1488,7 +1488,7 @@ if (typeof jQuery === 'undefined') {

var complete = function () {
var prevHoverState = that.hoverState
that.$element.trigger('shown.bs.' + that.type)
null!=that.$element && that.$element.trigger('shown.bs.' + that.type)
that.hoverState = null

if (prevHoverState == 'out') that.leave(that)
Expand Down Expand Up @@ -1732,7 +1732,7 @@ if (typeof jQuery === 'undefined') {
var that = this
clearTimeout(this.timeout)
this.hide(function () {
that.$element.off('.' + that.type).removeData('bs.' + that.type)
null!=that.$element && that.$element.off('.' + that.type).removeData('bs.' + that.type)
if (that.$tip) {
that.$tip.detach()
}
Expand Down
Loading

0 comments on commit 8cf804b

Please sign in to comment.