Skip to content

Feature/ Don't reset the range to set a new one (Google flights way) #60

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
YannLeComte wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/ Don't reset the range to set a new one (Google flights way) #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
738f65e
Feature/ Don't reset the range to set a new one (Google flights way)
YannLeComte Jun 15, 2018
adf2a03
cleanup
YannLeComte Jun 15, 2018
d67ec06
Dist update
YannLeComte Jun 15, 2018
c1c7eff
Delete dist
YannLeComte Jun 15, 2018
378bfdc
Rebuild with modification
YannLeComte Jun 15, 2018
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
2 changes: 1 addition & 1 deletion dist/md-date-range-picker.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Name: md-date-range-picker
* Version: 0.8.3
* Build Date: 2018-5-8
* Build Date: 6/15/2018
* Author: roel barreto <greatcodeideas@gmail.com>
*/
md-date-range {
Expand Down
32 changes: 28 additions & 4 deletions dist/md-date-range-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*
* Name: md-date-range-picker
* Version: 0.8.3
* Build Date: 2018-5-8
* Build Date: 6/15/2018
* Author: roel barreto <greatcodeideas@gmail.com>
*/
(function (window, angular) {
Expand Down Expand Up @@ -407,6 +407,8 @@
return ($scope.maxRange && Math.abs(Math.ceil(diff / (1000 * 3600 * 24))) + 1 <= $scope.maxRange || !$scope.maxRange);
}

var startModified = true;

function handleClickDate($event, date) {
var changed = false;
var shouldConfirm = false;
Expand Down Expand Up @@ -434,9 +436,31 @@
}
} else {
if (!$scope.isDisabledDate || !$scope.isDisabledDate({ $date: date })) {
$scope.dateStart = date;
$scope.dateEnd = date;
changed = true;
if (!$scope.isDisabledDate || !$scope.isDisabledDate({ $date: date })) {

if (moment(date).isBefore(moment($scope.dateStart), 'day')) {
$scope.dateStart = date;
startModified = true;

} else if (moment(date).isAfter(moment($scope.dateEnd), 'day')) {
$scope.dateEnd = date;
startModified = false;

} else if (moment(date).isBefore(moment($scope.dateEnd), 'day') && moment(date).isAfter(moment($scope.dateStart), 'day')) {
if (!startModified) {
$scope.dateStart = date;
startModified = true;
} else {
$scope.dateEnd = date;
startModified = false;
}
} else if (moment(date).isSame(moment($scope.dateEnd), 'day') || moment(date).isSame(moment($scope.dateStart), 'day')) {
$scope.dateStart = date;
$scope.dateEnd = date;
}

changed = true;
}
}
}
if (changed) {
Expand Down
Loading