Merge branch 'dev'

Author: trentrichardson

.jshintrc

@@ -10,6 +10,5 @@
 	"unused": true,
 	"boss": true,
 	"eqnull": true,
-	"node": true,
-	"es5": true
+	"node": true
 }

Gruntfile.js

@@ -46,6 +46,22 @@ module.exports = function(grunt) {
 						'src/docs/footer.html'
 					],
 				dest: 'dist/index.html'
+			},
+			i18n: {
+				options: {
+					//stripBanners: true,
+					banner: '<%=banner %>\n(function($){\n\n',
+					footer: '\n})(jQuery);\n',
+					process: function(src, filepath){
+						return '// source: '+ filepath + '\n' + 
+							src.replace(/\(function\s*\(\$\)\s*\{/g, '')
+								.replace(/\}\)\(jQuery\)\;/g, '')
+								.replace(/\$\.timepicker\.setDefaults\(\$\.timepicker\.regional\[[a-z\-\'\"]+\]\)\;/gi, '')
+								.trim() +'\n';
+					}
+				},
+				src: [ 'src/i18n/jquery-ui-timepicker-*.js' ],
+				dest: 'dist/i18n/<%=pkg.name %>-i18n.js'
 			}
 		},
 		uglify: {
@@ -55,6 +71,10 @@ module.exports = function(grunt) {
 			dist: {
 				src: '<%= concat.dist.dest %>',
 				dest: 'dist/<%= pkg.name %>.min.js'
+			},
+			i18n: {
+				src: 'dist/i18n/<%=pkg.name %>-i18n.js',
+				dest: 'dist/i18n/<%=pkg.name %>-i18n.min.js'
 			}
 		},
 		cssmin: {

bower.json

@@ -6,6 +6,6 @@
 		"url": "git://github.com/trentrichardson/jQuery-Timepicker-Addon.git"
 	},
 	"dependencies": {
-		"jquery-ui": "~1.9.2"
+		"jquery-ui": ">=1.9.2"
 	}
 }