diff options
| author | Trent <trentdrichardson@gmail.com> | 2015-05-07 14:15:46 -0400 |
|---|---|---|
| committer | Trent <trentdrichardson@gmail.com> | 2015-05-07 14:15:46 -0400 |
| commit | 5b2665f462fabcd148bc5cfec0b089a3fd141eb1 (patch) | |
| tree | 5551acd941650778bff883e9ac5a0fbfa12e9eb8 /dist/jquery-ui-timepicker-addon.js | |
| parent | 1e77bfefb0abba78bae32e615924002f5f6b2ef0 (diff) | |
| download | jQuery-Timepicker-Addon-5b2665f462fabcd148bc5cfec0b089a3fd141eb1.zip jQuery-Timepicker-Addon-5b2665f462fabcd148bc5cfec0b089a3fd141eb1.tar.gz jQuery-Timepicker-Addon-5b2665f462fabcd148bc5cfec0b089a3fd141eb1.tar.bz2 | |
Pull #809 - @sandermarechal Update grunt-contrib-uglify to fix build error and fix to prevent override of default events
Diffstat (limited to 'dist/jquery-ui-timepicker-addon.js')
| -rw-r--r-- | dist/jquery-ui-timepicker-addon.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dist/jquery-ui-timepicker-addon.js b/dist/jquery-ui-timepicker-addon.js index 247050d..baaf9fb 100644 --- a/dist/jquery-ui-timepicker-addon.js +++ b/dist/jquery-ui-timepicker-addon.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 */ (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"; })); |