Merge pull request #1 from trentrichardson/master

Update

Author: gaissa

Gruntfile.js

@@ -107,8 +107,8 @@ module.exports = function(grunt) {
 			options: {
 				specs: 'test/*_spec.js',
 				vendor: [
-						'http://code.jquery.com/jquery-1.10.1.min.js',
-						'http://code.jquery.com/ui/1.10.3/jquery-ui.min.js',
+						'http://code.jquery.com/jquery-1.11.1.min.js',
+						'http://code.jquery.com/ui/1.11.1/jquery-ui.min.js',
 						'http://github.com/searls/jasmine-fixture/releases/1.0.5/1737/jasmine-fixture.js'
 					]
 			}
@@ -162,6 +162,9 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-watch');
 
 	// Default task.
-	grunt.registerTask('default', ['jshint', 'jasmine', 'clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);
+	grunt.registerTask('default', ['clean', 'copy', 'concat', 'replace', 'uglify', 'cssmin']);
+
+	// Test task.
+	grunt.registerTask('test', ['jshint', 'jasmine']);
 
 };

README.md

@@ -12,16 +12,35 @@ Use
 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:
 
 - To use this plugin you must include jQuery (1.6+) and jQuery UI with datepicker (and optionally slider).
-- Include timepicker-addon script located in the `dist` directory.
+- Include timepicker-addon script and css located in the `dist` directory or from a CDN:
+  * [http://cdnjs.com/libraries/jquery-ui-timepicker-addon](http://cdnjs.com/libraries/jquery-ui-timepicker-addon)
+  * [http://www.jsdelivr.com/#!jquery.ui.timepicker.addon](http://www.jsdelivr.com/#!jquery.ui.timepicker.addon)
 - now use timepicker with `$('#selector').datetimepicker()` or `$('#selector').timepicker()`.
 
 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.
 
+Rails with Bower
+-----------------
+If you happen to use Rails with the [bower](gem "bower-rails", "~> 0.8.3") gem, here it is to use it easily :
+#### Bowerfile 
+```asset "jqueryui-timepicker-addon", "1.5.4"```
+
+#### application.js
+```javascript
+//= require jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon
+//= require jqueryui-timepicker-addon/dist/i18n/jquery-ui-timepicker-fr
+```
+
+#### application.css.scss
+```scss
+@import "jqueryui-timepicker-addon/dist/jquery-ui-timepicker-addon.css";
+```
+
 Contributing Code - Please Read!
 --------------------------------
 - All code contributions and bug reports are much appreciated.
 - Please be sure to apply your fixes to the "dev" branch.
 - Also note tabs are appreciated over spaces.
 - Please read the [CONTRIBUTING.md][contributingmd] for more on using Grunt to produce builds.
 
-[contributingmd]: CONTRIBUTING.md
+[contributingmd]: CONTRIBUTING.md

bower.json

@@ -1,11 +1,11 @@
 {
 	"name": "jqueryui-timepicker-addon",
-	"version": "1.4.4",
+	"version": "1.5.5",
 	"repository": {
 		"type": "git",
 		"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
 	},
+	"main": ["dist/jquery-ui-timepicker-addon.js", "dist/jquery-ui-timepicker-addon.css"],
 	"dependencies": {
-		"jquery-ui": ">=1.9.2"
 	}
 }