From 8cbef184f366d8b6ede241a0b18ad9c26542f3e7 Mon Sep 17 00:00:00 2001
From: Felix Niklas <mrflix@gmail.com>
Date: Tue, 15 Sep 2015 17:44:36 +0200
Subject: [PATCH] timepicker: auto-add am/pm class when its set

---
 .../javascripts/app/lib/bootstrap/bootstrap-timepicker.js     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
index d612254d9..377fbd3f1 100644
--- a/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
+++ b/app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js
@@ -49,7 +49,9 @@
       var self = this;
 
       if (this.$element.hasClass('time--12')) {
-        this.showMeridian = true
+        this.showMeridian = true;
+      } else if(this.showMeridian) {
+        this.$element.addClass('time--12');
       }
 
       if (this.showWidgetOnAddonClick && (this.$element.parent().hasClass('input-append') || this.$element.parent().hasClass('input-prepend'))) {