summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Johnson <ross@mazira.com>2012-02-28 13:19:28 -0600
committerRoss Johnson <ross@mazira.com>2012-02-28 13:19:28 -0600
commitcaea8b1d17d7b0866e9f3382415d5153d1e122ce (patch)
treec2ad970f146d5e9b771751021a52d6d916e35678
parentba9f293995d7662e131873fb483dc3ad84681893 (diff)
downloadjQuery-Timepicker-Addon-caea8b1d17d7b0866e9f3382415d5153d1e122ce.zip
jQuery-Timepicker-Addon-caea8b1d17d7b0866e9f3382415d5153d1e122ce.tar.gz
jQuery-Timepicker-Addon-caea8b1d17d7b0866e9f3382415d5153d1e122ce.tar.bz2
Fixed clobbering of global variable 'o'
-rw-r--r--jquery-ui-timepicker-addon.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js
index 4c0be70..fee9769 100644
--- a/jquery-ui-timepicker-addon.js
+++ b/jquery-ui-timepicker-addon.js
@@ -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);