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

datepicker popup return the focus to the wrong element #6069

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

datepicker popup return the focus to the wrong element #6069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst

$scope.$emit('uib:datepicker.mode');
}

$scope.$broadcast('uib:datepicker.focus');

};

$scope.move = function(direction) {
Expand Down
2 changes: 1 addition & 1 deletion template/datepicker/datepicker.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div ng-switch="datepickerMode">
<div ng-switch="datepickerMode" contenteditable="true" ng-keydown="keydown($event)">
<div uib-daypicker ng-switch-when="day" tabindex="0" class="uib-daypicker"></div>
<div uib-monthpicker ng-switch-when="month" tabindex="0" class="uib-monthpicker"></div>
<div uib-yearpicker ng-switch-when="year" tabindex="0" class="uib-yearpicker"></div>
Expand Down
2 changes: 1 addition & 1 deletion template/datepickerPopup/popup.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested contenteditable="true" ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
<li ng-transclude></li>
<li ng-if="showButtonBar" class="uib-button-bar">
<span class="btn-group pull-left">
Expand Down