Fix trentrichardson#607 jquery noConflict issue

trentrichardson · trentrichardson · commit b872d7403ce7 · 2013-07-16T09:54:43.000-04:00
diff --git 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];

Original file line number	Diff line number	Diff line change
`@@ -229,7 +229,7 @@`
`229`	`229`
`230`	`230`	`// controlType is string - key to our this._controls`
`231`	`231`	`if(typeof(tp_inst._defaults.controlType) === 'string'){`
`232`		`- if(tp_inst._defaults.controlType == 'slider' && typeof(jQuery.ui.slider) === 'undefined'){`
	`232`	`+ if(tp_inst._defaults.controlType == 'slider' && typeof($.ui.slider) === 'undefined'){`
`233`	`233`	`tp_inst._defaults.controlType = 'select';`
`234`	`234`	`}`
`235`	`235`	`tp_inst.control = tp_inst._controls[tp_inst._defaults.controlType];`