Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 9f4c3a5

Browse files
committed
fix(position): positionArrow descendant selector
- The element selector was not limited to direct descendants so nested tooltip/popover arrow elements were getting selected instead of the direct descendant arrow element. Closes #5246 Fixes #5230
1 parent 3468888 commit 9f4c3a5

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/position/position.js

+3-7
Original file line numberDiff line numberDiff line change
@@ -464,17 +464,13 @@ angular.module('ui.bootstrap.position', [])
464464
positionArrow: function(elem, placement) {
465465
elem = this.getRawNode(elem);
466466

467-
var isTooltip = true;
468-
469-
var innerElem = elem.querySelector('.tooltip-inner');
470-
if (!innerElem) {
471-
isTooltip = false;
472-
innerElem = elem.querySelector('.popover-inner');
473-
}
467+
var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
474468
if (!innerElem) {
475469
return;
476470
}
477471

472+
var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');
473+
478474
var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
479475
if (!arrowElem) {
480476
return;

0 commit comments

Comments
 (0)