diff options
| author | Trent Richardson <trentdrichardson@gmail.com> | 2013-07-16 09:54:43 -0400 |
|---|---|---|
| committer | Trent Richardson <trentdrichardson@gmail.com> | 2013-07-16 09:54:43 -0400 |
| commit | b872d7403ce770e3ed8b7ea5207452660549f42d (patch) | |
| tree | 4d60981125f3fdecf1f20961bbaf44ee400bf1b2 | |
| parent | a0ad2eac20a6f93edd51aa42177c9375bf82e10f (diff) | |
| download | jQuery-Timepicker-Addon-b872d7403ce770e3ed8b7ea5207452660549f42d.zip jQuery-Timepicker-Addon-b872d7403ce770e3ed8b7ea5207452660549f42d.tar.gz jQuery-Timepicker-Addon-b872d7403ce770e3ed8b7ea5207452660549f42d.tar.bz2 | |
Fix #607 jquery noConflict issue
| -rw-r--r-- | jquery-ui-timepicker-addon.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/jquery-ui-timepicker-addon.js b/jquery-ui-timepicker-addon.js index 50d6da3..f8edf43 100644 --- a/jquery-ui-timepicker-addon.js +++ b/jquery-ui-timepicker-addon.js @@ -229,7 +229,7 @@ // controlType is string - key to our this._controls if(typeof(tp_inst._defaults.controlType) === 'string'){ - if(tp_inst._defaults.controlType == 'slider' && typeof(jQuery.ui.slider) === 'undefined'){ + if(tp_inst._defaults.controlType == 'slider' && typeof($.ui.slider) === 'undefined'){ tp_inst._defaults.controlType = 'select'; } tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType]; |