update to v3

merging changes from staging branch

README.md

@@ -116,6 +116,30 @@ Finally include the main javascript file.
 ```
 
 # Change Log
+## 3.0.0
+## **Breaking changes in this update! Pay attention!!**
+* Fix for #170, #179, #183: Changed event to `dp.-` options load as `data-date-OPTION` instead of `data-OPTION`. This should fix the double change event firing.
+* Fix for #192: `setDate` now fires `dp.change`
+* Fix for #182: Picker will **not** set the default date if the input field has a value
+* Fix for #169: Seconds doesn't get reset when changing the date (Thanks to PR #174)
+* Fix for #168 z-index fix for BS modal
+* Fix for #155 Picker properly displays the active year and month
+* Fix for #154 CSS update to fix the collapse jump
+* Fix for #150 and #75 `minViewMode` and `viewMode` work properly
+* Fix for #147 AM/PM won't toggle when selecting a value from the hours grid
+* Fix for #44 Finally! It's here!! Thanks to @ruiwei and his code on #210 picker will adjust the positioning of the widget.
+
+#### **Manually merged PR**
+* #178 When using `minuteStepping` the minute select grid will only show available steppings
+* #195, #197 Using the `data-OPTION` has been changed to `data-date-OPTION`. These options are expected to be on the `input-group` if you're using the `form-group` **or** the input field
+* #184 The option `sideBySide` change be used to display both the d and the timepicker side by side
+* #143 Added option `daysOfWeekDisabled: []`. For example, use `daysOfWeekDisabled: [0,6]` to disable Sunday and Saturday
+
+#### **Other Changes**
+* Changed picker width to 300px if using seconds and am/pm
+* Added option `useCurrent`, thanks to @ruiwei. When true, picker will set the value to the current date/time (respects picker's format)
+* Added option `showToday`, thanks to @ruiwei. When true, picker will display a small arrow to indicate today's date.
+* Changed `startDate` to `minDate` and `endDate` to `maxDate` to make it more clear what these options do.
 
 ## 2.1.32 (Hotfix)
 

bower.json

@@ -1,14 +1,14 @@
 {
   "name": "eonasdan-bootstrap-datetimepicker",
-  "version": "2.2.22",
+  "version": "3.0.0",
   "main": [
     "build/css/bootstrap-datetimepicker.min.css",
     "build/js/bootstrap-datetimepicker.min.js"
   ],
   "dependencies": {
     "jquery": ">=1.8.3",
     "bootstrap": ">= 3.0",
-    "moment": ">=2.3.1"
+    "moment": ">=2.4.0"
   },
   "homepage": "https://github.com/Eonasdan/bootstrap-datetimepicker",
   "authors": [

build/css/bootstrap-datetimepicker.css

@@ -1,30 +1,20 @@
-/**
- * Build file for the dist version of datetimepicker.css
- */
 /*!
  * Datetimepicker for Bootstrap v3
  * https://github.com/Eonasdan/bootstrap-datetimepicker/
- * Copyright 2012 Stefan Petre
- * Licensed under the Apache License v2.0
- * http://www.apache.org/licenses/LICENSE-2.0
- *
  */
 .bootstrap-datetimepicker-widget {
   top: 0;
   left: 0;
   width: 250px;
   padding: 4px;
   margin-top: 1px;
-  z-index: 99999;
+  z-index: 99999 !important;
   border-radius: 4px;
-  /*.dow {
-  border-top: 1px solid #ddd !important;
-  }*/
 }
-.bootstrap-datetimepicker-widget .btn {
-  padding: 6px;
+.bootstrap-datetimepicker-widget.timepicker-sbs {
+  width: 600px;
 }
-.bootstrap-datetimepicker-widget:before {
+.bootstrap-datetimepicker-widget.bottom:before {
   content: '';
   display: inline-block;
   border-left: 7px solid transparent;
@@ -33,18 +23,42 @@
   border-bottom-color: rgba(0, 0, 0, 0.2);
   position: absolute;
   top: -7px;
-  left: 6px;
+  left: 7px;
 }
-.bootstrap-datetimepicker-widget:after {
+.bootstrap-datetimepicker-widget.bottom:after {
   content: '';
   display: inline-block;
   border-left: 6px solid transparent;
   border-right: 6px solid transparent;
   border-bottom: 6px solid white;
   position: absolute;
   top: -6px;
+  left: 8px;
+}
+.bootstrap-datetimepicker-widget.top:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-right: 7px solid transparent;
+  border-top: 7px solid #ccc;
+  border-top-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  bottom: -7px;
+  left: 6px;
+}
+.bootstrap-datetimepicker-widget.top:after {
+  content: '';
+  display: inline-block;
+  border-left: 6px solid transparent;
+  border-right: 6px solid transparent;
+  border-top: 6px solid white;
+  position: absolute;
+  bottom: -6px;
   left: 7px;
 }
+.bootstrap-datetimepicker-widget .dow {
+  width: 14.2857%;
+}
 .bootstrap-datetimepicker-widget.pull-right:before {
   left: auto;
   right: 6px;
@@ -97,12 +111,28 @@
 .bootstrap-datetimepicker-widget td.new {
   color: #999999;
 }
+.bootstrap-datetimepicker-widget td.today {
+  position: relative;
+}
+.bootstrap-datetimepicker-widget td.today:before {
+  content: '';
+  display: inline-block;
+  border-left: 7px solid transparent;
+  border-bottom: 7px solid #428bca;
+  border-top-color: rgba(0, 0, 0, 0.2);
+  position: absolute;
+  bottom: 4px;
+  right: 4px;
+}
 .bootstrap-datetimepicker-widget td.active,
 .bootstrap-datetimepicker-widget td.active:hover {
   background-color: #428bca;
   color: #fff;
   text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
 }
+.bootstrap-datetimepicker-widget td.active.today:before {
+  border-bottom-color: #fff;
+}
 .bootstrap-datetimepicker-widget td.disabled,
 .bootstrap-datetimepicker-widget td.disabled:hover {
   background: none;
@@ -169,6 +199,6 @@
   left: auto;
   right: 7px;
 }
-.bootstrap-datetimepicker-widget ul.list-unstyled li.in div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
+.bootstrap-datetimepicker-widget ul.list-unstyled li div.timepicker div.timepicker-picker table.table-condensed tbody > tr > td {
   padding: 0px !important;
 }