Skip to content
GitLab
Commit 1fc08c19 authored by fat's avatar fat
Browse files

fixes #10568 - kill hoverstate info once command has been executed

parent a87b150b
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 6 additions and 2 deletions
+6 -2
dist/js/bootstrap.js
+ 2
- 0
View file @ 1fc08c19
...@@ -1179,6 +1179,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1179,6 +1179,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement) this.applyPlacement(calculatedOffset, placement)
this.hoverState = null
this.$element.trigger('shown.bs.' + this.type) this.$element.trigger('shown.bs.' + this.type)
} }
} }
...@@ -1267,6 +1268,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery" ...@@ -1267,6 +1268,7 @@ if (typeof jQuery === "undefined") { throw new Error("Bootstrap requires jQuery"
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
complete() complete()
this.hoverState = null
this.$element.trigger('hidden.bs.' + this.type) this.$element.trigger('hidden.bs.' + this.type)
return this return this
......
dist/js/bootstrap.min.js
+ 1
- 1
View file @ 1fc08c19
This diff is collapsed.
docs-assets/js/raw-files.js
+ 1
- 1
View file @ 1fc08c19
This diff is collapsed.
js/tooltip.js
+ 2
- 0
View file @ 1fc08c19
...@@ -177,6 +177,7 @@ ...@@ -177,6 +177,7 @@
var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight) var calculatedOffset = this.getCalculatedOffset(placement, pos, actualWidth, actualHeight)
this.applyPlacement(calculatedOffset, placement) this.applyPlacement(calculatedOffset, placement)
this.hoverState = null
this.$element.trigger('shown.bs.' + this.type) this.$element.trigger('shown.bs.' + this.type)
} }
} }
...@@ -265,6 +266,7 @@ ...@@ -265,6 +266,7 @@
.emulateTransitionEnd(150) : .emulateTransitionEnd(150) :
complete() complete()
this.hoverState = null
this.$element.trigger('hidden.bs.' + this.type) this.$element.trigger('hidden.bs.' + this.type)
return this return this
......
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