Skip to content

Dev #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 28, 2012
Merged

Dev #325

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b57a88
Update dev version
trentrichardson Feb 11, 2012
e795b3e
Remove unused variables, fix validation warnings
sarxos Feb 15, 2012
978cc0c
Merge pull request #318 from sarxos/dev
trentrichardson Feb 15, 2012
ba9f293
Prevent RangeError - Pull Request 324
trentrichardson Feb 28, 2012
caea8b1
Fixed clobbering of global variable 'o'
rossj Feb 28, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fixed clobbering of global variable 'o'
  • Loading branch information
@rossj
rossj committed Feb 28, 2012
commit caea8b1d17d7b0866e9f3382415d5153d1e122ce
2 changes: 1 addition & 1 deletion jquery-ui-timepicker-addon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ $.extend(Timepicker.prototype, {
// pattern for standard and localized AM/PM markers
//########################################################################
_getPatternAmpm: function() {
var markers = [];
var markers = [],
o = this._defaults;
if (o.amNames)
$.merge(markers, o.amNames);
Expand Down