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

Commit ea54221

Browse files
committed
Revert "Merge branch 'position-fix' of https://github.com/RobJacobs/bootstrap"
This reverts commit a25caa7, reversing changes made to 00ac93e.
1 parent a25caa7 commit ea54221

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

Diff for: src/position/position.js

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

467-
var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
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+
}
468474
if (!innerElem) {
469475
return;
470476
}
471477

472-
var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');
473-
474478
var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
475479
if (!arrowElem) {
476480
return;

0 commit comments

Comments
 (0)