Skip to content

Commit eed6bee

Browse files
author
Sander Marechal
committed
Port default-events
1 parent e797db2 commit eed6bee

7 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*! jQuery Timepicker Addon - v1.5.0 - 2014-09-01
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44

55
(function($){
66

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

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/jquery-ui-timepicker-addon.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*! jQuery Timepicker Addon - v1.5.0 - 2014-09-01
22
* http://trentrichardson.com/examples/timepicker
3-
* Copyright (c) 2014 Trent Richardson; Licensed MIT */
3+
* Copyright (c) 2015 Trent Richardson; Licensed MIT */
44
(function ($) {
55

66
/*
@@ -201,7 +201,7 @@
201201
};
202202
for (i in overrides) {
203203
if (overrides.hasOwnProperty(i)) {
204-
fns[i] = opts[i] || null;
204+
fns[i] = opts[i] || this._defaults[i] || null;
205205
}
206206
}
207207

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@
1111
"grunt-contrib-jshint": "~0.1.1",
1212
"grunt-contrib-jasmine": "~0.5.1",
1313
"grunt-contrib-concat": "~0.4.0",
14-
"grunt-contrib-uglify": "~0.1.1",
14+
"grunt-contrib-uglify": "~0.9.1",
1515
"grunt-contrib-watch": "~0.2.0",
1616
"grunt-contrib-clean": "~0.4.0",
1717
"grunt-contrib-copy": "~0.4.0",
1818
"grunt-contrib-cssmin": "~0.6.0",
1919
"grunt-replace": "~0.4.4",
2020
"grunt": "~0.4.1"
2121
}
22-
}
22+
}

src/jquery-ui-timepicker-addon.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@
207207
};
208208
for (i in overrides) {
209209
if (overrides.hasOwnProperty(i)) {
210-
fns[i] = opts[i] || null;
210+
fns[i] = opts[i] || this._defaults[i] || null;
211211
}
212212
}
213213

0 commit comments

Comments
 (0)