Skip to content

Commit e130b66

Browse files
Merge branch 'dev'
2 parents 69348fd + 1a71b5f commit e130b66

18 files changed

+247
-167
lines changed

README.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@ Use
1212
I recommend getting the eBook [Handling Time](https://sellfy.com/p/8gxZ) as it has a lot of example code to get started. The quick and dirty:
1313

1414
- To use this plugin you must include jQuery (1.6+) and jQuery UI with datepicker (and optionally slider).
15-
- Include timepicker-addon script located in the `dist` directory.
15+
- Include timepicker-addon script and css located in the `dist` directory or from a CDN:
16+
* [http://cdnjs.com/libraries/jquery-ui-timepicker-addon](http://cdnjs.com/libraries/jquery-ui-timepicker-addon)
17+
* [http://www.jsdelivr.com/#!jquery.ui.timepicker.addon](http://www.jsdelivr.com/#!jquery.ui.timepicker.addon)
1618
- now use timepicker with `$('#selector').datetimepicker()` or `$('#selector').timepicker()`.
1719

1820
There is also a [Bower](http://bower.io/) package named `jqueryui-timepicker-addon`. Beware there are other similar package names that point to forks which may not be current.

bower.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
{
22
"name": "jqueryui-timepicker-addon",
3-
"version": "1.4.4",
3+
"version": "1.4.6",
44
"repository": {
55
"type": "git",
66
"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
77
},
88
"dependencies": {
9-
"jquery-ui": ">=1.9.2"
109
}
1110
}

0 commit comments

Comments
 (0)