Skip to content

Commit dc09d27

Browse files
committed
code cleanup before merge
- extracted onEvent function for click and focus events - fixed keydown binding
1 parent b33241a commit dc09d27

File tree

1 file changed

+13
-14
lines changed

1 file changed

+13
-14
lines changed

angular-dropdowns.js

+13-14
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,15 @@
8787
});
8888
};
8989

90-
$element.bind('click', function (event) {
90+
var onEvent = function (event) {
9191
event.stopPropagation();
9292
if (!$scope.dropdownDisabled) {
9393
DropdownService.toggleActive($element);
9494
}
95-
});
95+
};
9696

97-
$element.bind('focus', function (event) {
98-
event.stopPropagation();
99-
if (!$scope.dropdownDisabled) {
100-
DropdownService.toggleActive($element);
101-
}
102-
});
97+
$element.bind('click', onEvent);
98+
$element.bind('focus', onEvent);
10399

104100
$scope.$on('$destroy', function () {
105101
DropdownService.unregister($element);
@@ -174,12 +170,14 @@
174170
});
175171
};
176172

177-
$element.bind('click', function (event) {
173+
var onEvent = function (event) {
178174
event.stopPropagation();
179175
if (!$scope.dropdownDisabled) {
180-
DropdownService.toggleActive(tpl);
176+
DropdownService.toggleActive($element);
181177
}
182-
});
178+
};
179+
180+
$element.bind('click', onEvent);
183181

184182
$scope.$on('$destroy', function () {
185183
DropdownService.unregister(tpl);
@@ -225,9 +223,10 @@
225223
});
226224
});
227225

228-
body.keydown(function(e) {
229-
var code = e.keyCode || e.which;
230-
if (code == '9') {
226+
body.bind('keydown', function (evt) {
227+
var code = evt.keyCode || evt.which;
228+
//on tab, remove 'active' any dropdown element
229+
if (code === 9) {
231230
angular.forEach(_dropdowns, function (el) {
232231
el.removeClass('active');
233232
});

0 commit comments

Comments
 (0)