changed handling of selection of already selected dates, closes t1m0n…

…#105

Now for selecting single date in range mode, `toggleSelected` must be `false`

dist/js/datepicker.js

@@ -1083,6 +1083,30 @@
  }
  },
 
+ _handleAlreadySelectedDates: function (alreadySelected, selectedDate) {
+ if (this.opts.range) {
+ if (!this.opts.toggleSelected) {
+ // Add possibility to select same date when range is true
+ if (this.selectedDates.length != 2) {
+ this._trigger('clickCell', selectedDate);
+ }
+ } else {
+ this.removeDate(selectedDate);
+ }
+ } else if (this.opts.toggleSelected){
+ this.removeDate(selectedDate);
+ }
+
+ // Change last selected date to be able to change time when clicking on this cell
+ if (!this.opts.toggleSelected) {
+ this.lastSelectedDate = alreadySelected;
+ if (this.opts.timepicker) {
+ this.timepicker._setTime(alreadySelected);
+ this.timepicker.update();
+ }
+ }
+ },
+
  _onShowEvent: function (e) {
  if (!this.visible) {
  this.show();
@@ -1157,9 +1181,9 @@
  this.focused.setMinutes(this.timepicker.minutes);
  }
  this.selectDate(this.focused);
- } else if (alreadySelected && this.opts.toggleSelected){
- this.removeDate(this.focused);
+ return;
  }
+ this._handleAlreadySelectedDates(alreadySelected, this.focused)
  }
  }
  }
@@ -1755,27 +1779,11 @@
 
  if (!alreadySelected) {
  dp._trigger('clickCell', selectedDate);
+ return;
  }
 
- if (alreadySelected && this.opts.range) {
- // Add possibility to select same date when range is true
- if (dp.selectedDates.length != 2 && !this.opts.toggleSelected || this.opts.toggleSelected) {
- dp._trigger('clickCell', selectedDate);
- // Change last selected date to be able to change time on last date
- dp.lastSelectedDate = alreadySelected;
- }
- } else if (alreadySelected && this.opts.toggleSelected){
- dp.removeDate(selectedDate);
- }
+ dp._handleAlreadySelectedDates.bind(dp, alreadySelected, selectedDate)();
 
- // Change last selected date to be able to change time when clicking on this cell
- if (alreadySelected && !this.opts.toggleSelected) {
- dp.lastSelectedDate = alreadySelected;
- if (dp.opts.timepicker) {
- dp.timepicker._setTime(alreadySelected);
- dp.timepicker.update();
- }
- }
  },
 
  _onClickCell: function (e) {

src/js/body.js

@@ -293,27 +293,11 @@
 
  if (!alreadySelected) {
  dp._trigger('clickCell', selectedDate);
+ return;
  }
 
- if (alreadySelected && this.opts.range) {
- // Add possibility to select same date when range is true
- if (dp.selectedDates.length != 2 && !this.opts.toggleSelected || this.opts.toggleSelected) {
- dp._trigger('clickCell', selectedDate);
- // Change last selected date to be able to change time on last date
- dp.lastSelectedDate = alreadySelected;
- }
- } else if (alreadySelected && this.opts.toggleSelected){
- dp.removeDate(selectedDate);
- }
+ dp._handleAlreadySelectedDates.bind(dp, alreadySelected, selectedDate)();
 
- // Change last selected date to be able to change time when clicking on this cell
- if (alreadySelected && !this.opts.toggleSelected) {
- dp.lastSelectedDate = alreadySelected;
- if (dp.opts.timepicker) {
- dp.timepicker._setTime(alreadySelected);
- dp.timepicker.update();
- }
- }
  },
 
  _onClickCell: function (e) {

src/js/datepicker.js

@@ -1083,6 +1083,30 @@
  }
  },
 
+ _handleAlreadySelectedDates: function (alreadySelected, selectedDate) {
+ if (this.opts.range) {
+ if (!this.opts.toggleSelected) {
+ // Add possibility to select same date when range is true
+ if (this.selectedDates.length != 2) {
+ this._trigger('clickCell', selectedDate);
+ }
+ } else {
+ this.removeDate(selectedDate);
+ }
+ } else if (this.opts.toggleSelected){
+ this.removeDate(selectedDate);
+ }
+
+ // Change last selected date to be able to change time when clicking on this cell
+ if (!this.opts.toggleSelected) {
+ this.lastSelectedDate = alreadySelected;
+ if (this.opts.timepicker) {
+ this.timepicker._setTime(alreadySelected);
+ this.timepicker.update();
+ }
+ }
+ },
+
  _onShowEvent: function (e) {
  if (!this.visible) {
  this.show();
@@ -1157,9 +1181,9 @@
  this.focused.setMinutes(this.timepicker.minutes);
  }
  this.selectDate(this.focused);
- } else if (alreadySelected && this.opts.toggleSelected){
- this.removeDate(this.focused);
+ return;
  }
+ this._handleAlreadySelectedDates(alreadySelected, this.focused)
  }
  }
  }