Pull trentrichardson#809 - @sandermarechal Update grunt-contrib-uglify to fix build error and fix to prevent override of default events

Author: trentrichardson

dist/i18n/jquery-ui-timepicker-addon-i18n.js

@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
+/*! jQuery Timepicker Addon - v1.5.4 - 2015-04-19
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 

dist/i18n/jquery-ui-timepicker-addon-i18n.min.js

@@ -113,7 +113,7 @@ <h3>Requirements</h3>
 
 	<br />
 	<h3>Version</h3>
-	<p>Version 1.5.3</p>
+	<p>Version 1.5.4</p>
 
 	<p>Last updated on 2015-04-19</p>
 	<p>jQuery Timepicker Addon is currently available for use in all personal or commercial projects under the MIT license.</p>

dist/index.html

@@ -1,4 +1,4 @@
-/*! jQuery Timepicker Addon - v1.5.3 - 2015-04-19
+/*! jQuery Timepicker Addon - v1.5.4 - 2015-04-19
 * http://trentrichardson.com/examples/timepicker
 * Copyright (c) 2015 Trent Richardson; Licensed MIT */
 (function (factory) {
@@ -22,7 +22,7 @@
 	*/
 	$.extend($.ui, {
 		timepicker: {
-			version: "1.5.3"
+			version: "1.5.4"
 		}
 	});
 
@@ -209,7 +209,7 @@
 			};
 			for (i in overrides) {
 				if (overrides.hasOwnProperty(i)) {
-					fns[i] = opts[i] || null;
+					fns[i] = opts[i] || this._defaults[i] || null;
 				}
 			}
 
@@ -2240,6 +2240,6 @@
 	/*
 	* Keep up with the version
 	*/
-	$.timepicker.version = "1.5.3";
+	$.timepicker.version = "1.5.4";
 
 }));

dist/jquery-ui-timepicker-addon.js

@@ -11,7 +11,7 @@
 		"grunt-contrib-jshint": "~0.1.1",
 		"grunt-contrib-jasmine": "~0.5.1",
 		"grunt-contrib-concat": "~0.4.0",
-		"grunt-contrib-uglify": "~0.1.1",
+		"grunt-contrib-uglify": "~0.9.1",
 		"grunt-contrib-watch": "~0.2.0",
 		"grunt-contrib-clean": "~0.4.0",
 		"grunt-contrib-copy": "~0.4.0",

dist/jquery-ui-timepicker-addon.min.css

@@ -215,7 +215,7 @@
 			};
 			for (i in overrides) {
 				if (overrides.hasOwnProperty(i)) {
-					fns[i] = opts[i] || null;
+					fns[i] = opts[i] || this._defaults[i] || null;
 				}
 			}