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

Commit

Permalink
fix(position): positionArrow descendant selector
Browse files Browse the repository at this point in the history
- 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
  • Loading branch information
RobJacobs committed Jan 14, 2016
1 parent 3468888 commit 9f4c3a5
Showing 1 changed file with 3 additions and 7 deletions.
10 changes: 3 additions & 7 deletions src/position/position.js
Original file line number Diff line number Diff line change
Expand Up @@ -464,17 +464,13 @@ angular.module('ui.bootstrap.position', [])
positionArrow: function(elem, placement) {
elem = this.getRawNode(elem);

var isTooltip = true;

var innerElem = elem.querySelector('.tooltip-inner');
if (!innerElem) {
isTooltip = false;
innerElem = elem.querySelector('.popover-inner');
}
var innerElem = elem.querySelector('.tooltip-inner, .popover-inner');
if (!innerElem) {
return;
}

var isTooltip = angular.element(innerElem).hasClass('tooltip-inner');

var arrowElem = isTooltip ? elem.querySelector('.tooltip-arrow') : elem.querySelector('.arrow');
if (!arrowElem) {
return;
Expand Down

0 comments on commit 9f4c3a5

Please sign in to comment.