Skip to content

Commit

Permalink
v2.1.14
Browse files Browse the repository at this point in the history
  • Loading branch information
dangrossman committed Dec 11, 2015
1 parent b1bc05d commit 7d85c53
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
7 changes: 5 additions & 2 deletions daterangepicker.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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();
}
}

Expand Down
2 changes: 1 addition & 1 deletion package.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down

0 comments on commit 7d85c53

Please sign in to comment.