Merge remote-tracking branch 'upstream/master' into bug/prevent-bad-c…

…haracters

* upstream/master:
  Version bump
  Version bump
  Fixed onRender method according to PR #571
  Version bump
  Fix exception thrown after clearing value using built in clear button
  Ensure we are supporting all browsers for timezone abbreviation * browsers on a different OS will return a different format
  Update bootstrap-datetimepicker.css

README.md

@@ -323,7 +323,7 @@ This event is fired when a day is rendered inside the datepicker. Should return
 $('#date-end')
     .datetimepicker({
         onRender: function(date) {
-            return ev.date.valueOf() < date-start-display.valueOf() ? ' disabled' : '';
+            return date.valueOf() < date-start-display.valueOf() ? ' disabled' : '';
         }
     });
 ```

css/bootstrap-datetimepicker.css

@@ -192,7 +192,7 @@
 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
 	background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
 	background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
-	background-image: linear-gradient(top, #fdd49a, #fdf59a);
+	background-image: linear-gradient(to bottom, #fdd49a, #fdf59a);
 	background-repeat: repeat-x;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
 	border-color: #fdf59a #fdf59a #fbed50;
@@ -244,7 +244,7 @@
 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
 	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
 	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-	background-image: linear-gradient(top, #0088cc, #0044cc);
+	background-image: linear-gradient(to bottom, #0088cc, #0044cc);
 	background-repeat: repeat-x;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
 	border-color: #0044cc #0044cc #002a80;
@@ -343,7 +343,7 @@
 	background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
 	background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
 	background-image: -o-linear-gradient(top, #0088cc, #0044cc);
-	background-image: linear-gradient(top, #0088cc, #0044cc);
+	background-image: linear-gradient(to bottom, #0088cc, #0044cc);
 	background-repeat: repeat-x;
 	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
 	border-color: #0044cc #0044cc #002a80;

js/bootstrap-datetimepicker.js

@@ -63,6 +63,24 @@
     return isFixed;
   }
 
+  // Add timezone abbreviation support for ie6+, Chrome, Firefox
+  function timeZoneAbbreviation() {
+    var abbreviation, date, formattedStr, i, len, matchedStrings, ref, str;
+    date = (new Date).toString();
+    formattedStr = ((ref = date.split('(')[1]) != null ? ref.slice(0, -1) : void 0) || date.split(' ');
+    if (formattedStr instanceof Array) {
+      matchedStrings = [];
+      for (i = 0, len = formattedStr.length; i < len; i++) {
+        str = formattedStr[i];
+        if (abbreviation = (ref = str.match(/\b[A-Z]+\b/)) != null ? ref[0] : void 0) {
+          matchedStrings.push(abbreviation);
+        }
+      }
+      formattedStr = matchedStrings.pop();
+    }
+    return formattedStr;
+  };
+
   function UTCDate() {
     return new Date(Date.UTC.apply(Date, arguments));
   }
@@ -109,8 +127,7 @@
     this.initialDate = options.initialDate || new Date();
     this.zIndex = options.zIndex || this.element.data('z-index') || undefined;
     this.title = typeof options.title === 'undefined' ? false : options.title;
-    this.defaultTimeZone = (new Date).toString().split('(')[1].slice(0, -1);
-    this.timezone = options.timezone || this.defaultTimeZone;
+    this.timezone = options.timezone || timeZoneAbbreviation();
 
     this.icons = {
       leftArrow: this.fontAwesome ? 'fa-arrow-left' : (this.bootcssVer === 3 ? 'glyphicon-arrow-left' : 'icon-arrow-left'),
@@ -253,6 +270,7 @@
 
     this.weekStart = ((options.weekStart || this.element.data('date-weekstart') || dates[this.language].weekStart || 0) % 7);
     this.weekEnd = ((this.weekStart + 6) % 7);
+    this.onRender = options.onRender || function () { return ''; };
     this.startDate = -Infinity;
     this.endDate = Infinity;
     this.datesDisabled = [];
@@ -388,6 +406,9 @@
 
     getDate: function () {
       var d = this.getUTCDate();
+      if (d === null) {
+        return null;
+      }
       return new Date(d.getTime() + (d.getTimezoneOffset() * 60000));
     },
 
@@ -677,12 +698,11 @@
       nextMonth.setUTCDate(nextMonth.getUTCDate() + 42);
       nextMonth = nextMonth.valueOf();
       var html = [];
-      var clsName;
+      var clsName = this.onRender(prevMonth)
       while (prevMonth.valueOf() < nextMonth) {
         if (prevMonth.getUTCDay() == this.weekStart) {
           html.push('<tr>');
         }
-        clsName = '';
         if (prevMonth.getUTCFullYear() < year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() < month)) {
           clsName += ' old';
         } else if (prevMonth.getUTCFullYear() > year || (prevMonth.getUTCFullYear() == year && prevMonth.getUTCMonth() > month)) {

package.json

@@ -2,7 +2,7 @@
   "name": "bootstrap-datetime-picker",
   "homepage": "http://www.malot.fr/bootstrap-datetimepicker/",
   "description": "Both Date and Time picker widget based on twitter bootstrap",
-  "version": "2.3.11",
+  "version": "2.3.14",
   "license": "Apache 2.0",
   "author": {
     "name": "Sebastien Malot"