merged jdewit#222 AM / PM designators

with some changes for variable length... eg: Czech [dop., odp.]

Author: eleumik

js/bootstrap-timepicker.js

@@ -30,6 +30,9 @@
     this.appendWidgetTo = options.appendWidgetTo;
     this.showWidgetOnAddonClick = options.showWidgetOnAddonClick;
     this.timeSeparator = options.timeSeparator;
+    this.amDesignator = options.amDesignator ? options.amDesignator : 'AM';
+    this.pmDesignator = options.pmDesignator ? options.pmDesignator : 'PM';
+    
     this._init();
   };
 
@@ -299,7 +302,7 @@
       case 'modal':
         template = '<div class="bootstrap-timepicker-widget modal hide fade in" data-backdrop="'+ (this.modalBackdrop ? 'true' : 'false') +'">'+
           '<div class="modal-header">'+
-            '<a href="#" class="close" data-dismiss="modal">×</a>'+
+            '<a href="#" class="close" data-dismiss="modal">&times;</a>'+
             '<h3>Pick a Time</h3>'+
           '</div>'+
           '<div class="modal-content">'+
@@ -484,23 +487,17 @@
       this.highlightedUnit = 'meridian';
 
 			if ($element.setSelectionRange) {
+				var start;
 				if (this.showSeconds) {
-					setTimeout(function() {
-            if (self.hour < 10) {
-              $element.setSelectionRange(8,10);
-            } else {
-              $element.setSelectionRange(9,11);
-            }
-					}, 0);
+					start = self.hour < 10 ? 8 : 9;
 				} else {
+					start = self.hour < 10 ? 5 : 6;
+				}
+				 
 					setTimeout(function() {
-            if (self.hour < 10) {
-              $element.setSelectionRange(5,7);
-            } else {
-              $element.setSelectionRange(6,8);
-            }
+				$element.setSelectionRange(start,start+self.meridian.length);
 					}, 0);
-				}
+				
 			}
     },
 
@@ -677,7 +674,7 @@
             hours = dTime.getHours(),
             minutes = dTime.getMinutes(),
             seconds = dTime.getSeconds(),
-            meridian = 'AM';
+            meridian = this.amDesignator;
 
           if (seconds !== 0) {
             seconds = Math.ceil(dTime.getSeconds() / this.secondStep) * this.secondStep;
@@ -702,9 +699,9 @@
               if (hours > 12) {
                 hours = hours - 12;
               }
-              meridian = 'PM';
+              meridian = this.pmDesignator;
             } else {
-              meridian = 'AM';
+              meridian = this.amDesignator;
             }
           }
 
@@ -719,7 +716,7 @@
           this.hour = 0;
           this.minute = 0;
           this.second = 0;
-          this.meridian = 'AM';
+          this.meridian = this.amDesignator;
         } else {
           this.setTime(defaultTime);
         }
@@ -747,21 +744,21 @@
         second  = time.getSeconds();
 
         if (this.showMeridian){
-          meridian = 'AM';
+          meridian = this.amDesignator;
           if (hour > 12){
-            meridian = 'PM';
+            meridian = this.pmDesignator;
             hour = hour % 12;
           }
 
           if (hour === 12){
-            meridian = 'PM';
+            meridian = this.pmDesignator;
           }
         }
       } else {
         if (time.match(/p/i) !== null) {
-          meridian = 'PM';
+          meridian = this.pmDesignator;
         } else {
-          meridian = 'AM';
+          meridian = this.amDesignator;
         }
         // Don't know how to include dynamically a char do both [.:]
         time = time.replace(/[^0-9\:\.]/g, '');
@@ -813,7 +810,7 @@
           } else if (hour < 0) {
             hour = 0;
           }
-          if (hour < 13 && meridian === 'PM') {
+          if (hour < 13 && meridian === this.pmDesignator) {
             hour = hour + 12;
           }
         }
@@ -902,7 +899,7 @@
     },
 
     toggleMeridian: function() {
-      this.meridian = this.meridian === 'AM' ? 'PM' : 'AM';
+      this.meridian = this.meridian === this.amDesignator ? this.pmDesignator : this.amDesignator;
     },
 
     update: function(ignoreWidget) {
@@ -1089,7 +1086,9 @@
     template: 'dropdown',
     appendWidgetTo: 'body',
     showWidgetOnAddonClick: true,
-    timeSeparator : ':'
+    timeSeparator : ':',
+    amDesignator : 'AM',
+    pmDesignator : 'PM',
   };
 
   $.fn.timepicker.Constructor = Timepicker;