From 87b3b4b72f19e3b7917d26dc79a7e457df5ecea7 Mon Sep 17 00:00:00 2001
From: Dan Grossman <dan@awio.com>
Date: Thu, 17 Dec 2015 17:19:38 -0500
Subject: [PATCH] Fix a time picker bug

---
 daterangepicker.js | 26 ++++++++++++++++++++------
 package.js         |  2 +-
 package.json       |  2 +-
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/daterangepicker.js b/daterangepicker.js
index b6c8c6d4..7b4b117d 100644
--- a/daterangepicker.js
+++ b/daterangepicker.js
@@ -1,5 +1,5 @@
 /**
-* @version: 2.1.14
+* @version: 2.1.15
 * @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
@@ -850,11 +850,25 @@
                 //Preserve the time already selected
                 var timeSelector = this.container.find('.calendar.right .calendar-time div');
                 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();
+
+                    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 (!this.timePicker24Hour) {
+                        var ampm = timeSelector.find('.ampmselect option:selected').val();
+                        if (ampm === 'PM' && selected.hour() < 12)
+                            selected.hour(selected.hour() + 12);
+                        if (ampm === 'AM' && selected.hour() === 12)
+                            selected.hour(0);
+                    }
+
+                    if (selected.isBefore(this.startDate))
+                        selected = this.startDate.clone();
+
+                    if (selected.isAfter(maxDate))
+                        selected = maxDate.clone();
+
                 }
             }
 
diff --git a/package.js b/package.js
index 62059926..d633c426 100644
--- a/package.js
+++ b/package.js
@@ -1,6 +1,6 @@
 Package.describe({
   name: 'dangrossman:bootstrap-daterangepicker',
-  version: '2.1.14',
+  version: '2.1.15',
   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 4e432934..bfc6db28 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap-daterangepicker",
-  "version": "2.1.14",
+  "version": "2.1.15",
   "description": "Date range picker component for Bootstrap",
   "main": "daterangepicker.js",
   "style": "daterangepicker.css",