From 7d85c5319060efab4ad10d5d897187635e8ecde2 Mon Sep 17 00:00:00 2001 From: Dan Grossman Date: Fri, 11 Dec 2015 12:58:51 -0500 Subject: [PATCH] v2.1.14 --- daterangepicker.js | 7 +++++-- package.js | 2 +- package.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/daterangepicker.js b/daterangepicker.js index a04df85f..b6c8c6d4 100644 --- a/daterangepicker.js +++ b/daterangepicker.js @@ -1,5 +1,5 @@ /** -* @version: 2.1.13 +* @version: 2.1.14 * @author: Dan Grossman http://www.dangrossman.info/ * @copyright: Copyright (c) 2012-2015 Dan Grossman. All rights reserved. * @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php @@ -847,11 +847,14 @@ selected = this.endDate ? this.endDate.clone() : this.startDate.clone(); minDate = this.startDate; + //Preserve the time already selected var timeSelector = this.container.find('.calendar.right .calendar-time div'); - if(timeSelector.html() != '') { + if (timeSelector.html() != '') { selected.hour(timeSelector.find('.hourselect option:selected').val() || selected.hour()); selected.minute(timeSelector.find('.minuteselect option:selected').val() || selected.minute()); selected.second(timeSelector.find('.secondselect option:selected').val() || selected.second()); + if (selected.isAfter(maxDate)) + selected = maxDate.clone(); } } diff --git a/package.js b/package.js index d32fc122..62059926 100644 --- a/package.js +++ b/package.js @@ -1,6 +1,6 @@ Package.describe({ name: 'dangrossman:bootstrap-daterangepicker', - version: '2.1.13', + version: '2.1.14', summary: 'Date range picker component for Bootstrap', git: 'https://github.com/dangrossman/bootstrap-daterangepicker', documentation: 'README.md' diff --git a/package.json b/package.json index b31fec26..4e432934 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bootstrap-daterangepicker", - "version": "2.1.13", + "version": "2.1.14", "description": "Date range picker component for Bootstrap", "main": "daterangepicker.js", "style": "daterangepicker.css",