Skip to content

focus current selected date if selectionRule.range is true. #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dsuket wants to merge 2 commits into
base: master
Choose a base branch
from
+19 −5
Open

focus current selected date if selectionRule.range is true. #12

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e43fed
focus current selected date on showing calendar if selectionRule.rang…
Feb 19, 2015
feab1a7
do not show nextMonth, when _endRangeSelectedDate filled.
Feb 19, 2015
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
24 changes: 19 additions & 5 deletions js/BeatPicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,9 @@ BeatPicker.prototype = {
var clickBehaviour = $(this).data("click-behaviour");
var isDisabled = $(this).data("disabled");
!isDisabled && self._dateSelect(e);
clickBehaviour !== "not-avail" && self._updateDateMatrices(clickBehaviour ? 1 : -1, self._monthUnit);
if (!self._endRangeSelectedDate) {
clickBehaviour !== "not-avail" && self._updateDateMatrices(clickBehaviour ? 1 : -1, self._monthUnit);
}
});
li.text(dayCheck.day);
this.selectionRule.single && this._findSelectedDate(this._dateRows[i].data("date"), this._dateRows[i])
Expand Down Expand Up @@ -1078,7 +1080,19 @@ BeatPicker.prototype = {
},
_getDecisionOnEvents: function () {
var self = this;
this.on(this.events.hide, function (data) {
if (this.selectionRule.range) {
this.on(this.events.show, function (e) {
if (!e || !self._dateInputToNode || !self._startRangeSelectedDate || !self._endRangeSelectedDate) {
return;
}
if (e.currentTarget === self._dateInputToNode[0]) {
self._updateDateMatricesExactDate(self._endRangeSelectedDate, true);
} else {
self._updateDateMatricesExactDate(self._startRangeSelectedDate, true);
}
});
}
this.on(this.events.hide, function (e) {
( self._selectedDate || self._startRangeSelectedDate) && self._updateDateMatricesExactDate(self._selectedDate || self._startRangeSelectedDate, true);
self._markToday(new Date());
});
Expand Down Expand Up @@ -1285,13 +1299,13 @@ BeatPicker.prototype = {
show: function (e) {
this._calendarMainNode.css("display", "");
this._isHide = false;
!this.view.alwaysVisible && this._notifySubscribers(this.events.show);
!this.view.alwaysVisible && this._notifySubscribers(this.events.show, e);
this.selectionRule.range ? this._rangeStatesManager(e) : this._positionThisNodePlease(this.dateInputNode);
},
hide: function () {
hide: function (e) {
this._calendarMainNode.css("display", "none");
this._isHide = true;
this._notifySubscribers(this.events.hide);
this._notifySubscribers(this.events.hide, e);
},
today: function () {
this.currentDate = new Date();
Expand Down