Skip to content

Commit

Permalink
fixed #1066
Browse files Browse the repository at this point in the history
fixed #1087 `sideBySide` properly supports `toolbarPlacement [top, bottom]`

fixed #1119

fixed #1069 added input.blur()

fixed #1049 fixed doc example

fixed #999 picker now looks for an element with `.input-group-addon`
  • Loading branch information
Eonasdan committed Jul 18, 2015
2 parents d0f10be + 4cec029 commit d7ba83c
Show file tree
Hide file tree
Showing 17 changed files with 143 additions and 71 deletions.
1 change: 0 additions & 1 deletion .npmignore
Expand Up @@ -5,7 +5,6 @@
/node_modules
/Makefile
/test
/build
*.log
*.swp
*~
Expand Down
6 changes: 5 additions & 1 deletion Gruntfile.js
Expand Up @@ -86,13 +86,17 @@ module.exports = function (grunt) {
production: {
options: {
cleancss: true,
compress: true
compress: true,
paths: 'node_modules'
},
files: {
'build/css/bootstrap-datetimepicker.min.css': 'src/less/bootstrap-datetimepicker-build.less'
}
},
development: {
options: {
paths: 'node_modules'
},
files: {
'build/css/bootstrap-datetimepicker.css': 'src/less/bootstrap-datetimepicker-build.less'
}
Expand Down
8 changes: 5 additions & 3 deletions README.md
Expand Up @@ -5,7 +5,7 @@

## [View the manual and demos](http://eonasdan.github.io/bootstrap-datetimepicker/)

# v4.13.28
# v4.14.30

Is the current stable release. The latest and greatest changes are available from the [development branch](https://github.com/Eonasdan/bootstrap-datetimepicker/tree/development)

Expand All @@ -24,8 +24,10 @@ If you have issues, please check the following first:
* Please indicate which version of the picker you are using (this can be found at the top of any included file)

## Where do you use this?
I'd love to know if your public site is using this plugin and list your logo on the documentation site. Please email me `eonasdan at outlook dot com`. Do not submit issue/feature request to this email, they will be **ignored**.
I'd love to know if your public site is using this plugin and list your logo on the documentation site. Please email me `me at eonasdan dot com`.

##Priority support is available at an hourly rate. If you have an urgent request, bug or need installation help, please contact me at `me at eonasdan dot com` for a quote.

## [Installation instructions](http://eonasdan.github.io/bootstrap-datetimepicker/Installing/)

## [Change Log](http://eonasdan.github.io/bootstrap-datetimepicker/Version%204%20Changelog/)
## [Change Log](http://eonasdan.github.io/bootstrap-datetimepicker/Changelog/)
3 changes: 2 additions & 1 deletion build/css/bootstrap-datetimepicker.css
Expand Up @@ -299,7 +299,8 @@
.bootstrap-datetimepicker-widget table td.today:before {
content: '';
display: inline-block;
border: 0 0 7px 7px solid transparent;
border: solid transparent;
border-width: 0 0 7px 7px;
border-bottom-color: #337ab7;
border-top-color: rgba(0, 0, 0, 0.2);
position: absolute;
Expand Down
2 changes: 1 addition & 1 deletion build/css/bootstrap-datetimepicker.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions build/js/bootstrap-datetimepicker.min.js

Large diffs are not rendered by default.

19 changes: 18 additions & 1 deletion docs/ChangeLog.md
@@ -1,6 +1,23 @@
# Version 4

## 4.14.40
## 4.14.35

### Bug Squashing

fixed #1066

fixed #1087 `sideBySide` properly supports `toolbarPlacement [top, bottom]`

fixed #1119

fixed #1069 added input.blur()

fixed #1049 fixed doc example

fixed #999 picker now looks for an element with `.input-group-addon`


## 4.14.30

### New Features

Expand Down
46 changes: 42 additions & 4 deletions docs/Events.md
Expand Up @@ -4,6 +4,14 @@

Fired when the widget is hidden.

Parameters:

```
e = {
date //the currently set date. Type: moment object (clone)
}
```

Emitted from:

* toggle()
Expand All @@ -14,7 +22,11 @@ Emitted from:

### dp.show

Fired when the widget is shown
Fired when the widget is shown.

Parameters:

No parameters are include, listen to `dp.change` instead

Emitted from:

Expand All @@ -25,7 +37,16 @@ Emitted from:

### dp.change

Fired when the date is changed
Fired when the date is changed.

Parameters:

```
e = {
date, //date the picker changed to. Type: moment object (clone)
oldDate //previous date. Type: moment object (clone) or false in the event of a null
}
```

Emitted from:

Expand All @@ -40,7 +61,15 @@ Emitted from:

### dp.error

Fired when a selected date fails to pass validation
Fired when a selected date fails to pass validation.

Parameters:

```
e = {
date //the invalid date. Type: moment object (clone)
}
```

Emmited from:

Expand All @@ -53,6 +82,15 @@ Emmited from:

### dp.update

<small>4.14.30</small>

Fired (in most cases) when the `viewDate` changes. E.g. Next and Previous buttons, selecting a year.

Includes the new `viewDate` and a change type, e.g `YYYY` and `M` for year and month.
Parameters:

```
e = {
change, //Change type as a momentjs format token. Type: string e.g. yyyy on year change
viewDate //new viewDate. Type: moment object
}
```

0 comments on commit d7ba83c

Please sign in to comment.