Skip to content

Commit

Permalink
Merge pull request dangrossman#1948 from simsek97/master
Browse files Browse the repository at this point in the history
Fix for popper.js setAttribute issue
  • Loading branch information
dangrossman authored Aug 14, 2019
2 parents 37f07d9 + c59b977 commit 3d57f7b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions daterangepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -526,9 +526,9 @@
this.renderTimePicker('left');
this.renderTimePicker('right');
if (!this.endDate) {
this.container.find('.right .calendar-time select').attr('disabled', 'disabled').addClass('disabled');
this.container.find('.right .calendar-time select').prop('disabled', true).addClass('disabled');
} else {
this.container.find('.right .calendar-time select').removeAttr('disabled').removeClass('disabled');
this.container.find('.right .calendar-time select').prop('disabled', false).removeClass('disabled');
}
}
if (this.endDate)
Expand Down Expand Up @@ -1014,9 +1014,9 @@
updateFormInputs: function() {

if (this.singleDatePicker || (this.endDate && (this.startDate.isBefore(this.endDate) || this.startDate.isSame(this.endDate)))) {
this.container.find('button.applyBtn').removeAttr('disabled');
this.container.find('button.applyBtn').prop('disabled', false);
} else {
this.container.find('button.applyBtn').attr('disabled', 'disabled');
this.container.find('button.applyBtn').prop('disabled', true);
}

},
Expand Down

0 comments on commit 3d57f7b

Please sign in to comment.