Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.
18 changes: 12 additions & 6 deletions src/dropdown/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,23 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.multiMap', 'ui.bootstrap.
return;
}

var dropdownElement = openScope.getDropdownElement();
if (evt && openScope.getAutoClose() === 'outsideClick' &&
dropdownElement && dropdownElement[0].contains(evt.target)) {
return;
var dropdownElement = openScope.getDropdownElement(), noFocus;

if (evt && openScope.getAutoClose() === 'outsideClick') {
if (dropdownElement && dropdownElement[0].contains(evt.target)) {
return;
}
// Close dropdown without changing focus;
noFocus = true;
}

openScope.focusToggleElement();
if (!noFocus) {
openScope.focusToggleElement();
}
openScope.isOpen = false;

if (!$rootScope.$$phase) {
openScope.$apply();
openScope.$apply();
}
};

Expand Down