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 /src/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 'src/jquery-ui-timepicker-addon.js')
-rw-r--r-- | src/jquery-ui-timepicker-addon.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/jquery-ui-timepicker-addon.js b/src/jquery-ui-timepicker-addon.js index b156de8..540934a 100644 --- a/src/jquery-ui-timepicker-addon.js +++ b/src/jquery-ui-timepicker-addon.js @@ -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; } } |