Skip to content

Commit

Permalink
Fix #425
Browse files Browse the repository at this point in the history
  • Loading branch information
dangrossman committed Aug 18, 2014
1 parent 0993586 commit 3b9aa33
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-daterangepicker",
"version": "1.3.11",
"version": "1.3.12",
"main": [
"daterangepicker.js",
"daterangepicker-bs3.css"
Expand Down
10 changes: 7 additions & 3 deletions daterangepicker.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* @version: 1.3.11
* @version: 1.3.12
* @author: Dan Grossman http://www.dangrossman.info/
* @date: 2014-08-11
* @date: 2014-08-18
* @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved.
* @license: Licensed under Apache License v2.0. See http://www.apache.org/licenses/LICENSE-2.0
* @website: http://www.improvely.com/
Expand Down Expand Up @@ -841,7 +841,11 @@
this.leftCalendar.calendar = this.buildCalendar(this.leftCalendar.month.month(), this.leftCalendar.month.year(), this.leftCalendar.month.hour(), this.leftCalendar.month.minute(), 'left');
this.rightCalendar.calendar = this.buildCalendar(this.rightCalendar.month.month(), this.rightCalendar.month.year(), this.rightCalendar.month.hour(), this.rightCalendar.month.minute(), 'right');
this.container.find('.calendar.left').empty().html(this.renderCalendar(this.leftCalendar.calendar, this.startDate, this.minDate, this.maxDate));
this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, this.startDate, this.maxDate));

var minDate = this.minDate;
if (!this.singleDatePicker)
minDate = this.startDate;
this.container.find('.calendar.right').empty().html(this.renderCalendar(this.rightCalendar.calendar, this.endDate, minDate, this.maxDate));

this.container.find('.ranges li').removeClass('active');
var customRange = true;
Expand Down

0 comments on commit 3b9aa33

Please sign in to comment.