@@ -289,19 +289,17 @@ $.extend(Timepicker.prototype, {
289289 hourMax = parseInt ( ( o . hourMax - ( ( o . hourMax - o . hourMin ) % o . stepHour ) ) , 10 ) ,
290290 minMax = parseInt ( ( o . minuteMax - ( ( o . minuteMax - o . minuteMin ) % o . stepMinute ) ) , 10 ) ,
291291 secMax = parseInt ( ( o . secondMax - ( ( o . secondMax - o . secondMin ) % o . stepSecond ) ) , 10 ) ,
292- millisecMax = parseInt ( ( o . millisecMax - ( ( o . millisecMax - o . millisecMin ) % o . stepMillisec ) ) , 10 ) ,
293- dp_id = this . inst . id . toString ( ) . replace ( / ( [ ^ A - Z a - z 0 - 9 _ ] ) / g, '' ) ;
292+ millisecMax = parseInt ( ( o . millisecMax - ( ( o . millisecMax - o . millisecMin ) % o . stepMillisec ) ) , 10 ) ;
294293
295294 // Prevent displaying twice
296- //if ($dp.find("div#ui-timepicker-div-"+ dp_id).length === 0) {
297- if ( $dp . find ( "div#ui-timepicker-div-" + dp_id ) . length === 0 && o . showTimepicker ) {
295+ if ( $dp . find ( "div.ui-timepicker-div" ) . length === 0 && o . showTimepicker ) {
298296 var noDisplay = ' style="display:none;"' ,
299- html = '<div class="ui-timepicker-div" id="ui-timepicker-div-' + dp_id + '" ><dl>' +
300- '<dt class="ui_tpicker_time_label" id="ui_tpicker_time_label_' + dp_id + '" ' +
297+ html = '<div class="ui-timepicker-div"><dl>' +
298+ '<dt class="ui_tpicker_time_label"' +
301299 ( ( o . showTime ) ? '' : noDisplay ) + '>' + o . timeText + '</dt>' +
302- '<dd class="ui_tpicker_time" id="ui_tpicker_time_' + dp_id + '" ' +
300+ '<dd class="ui_tpicker_time"' +
303301 ( ( o . showTime ) ? '' : noDisplay ) + '></dd>' +
304- '<dt class="ui_tpicker_hour_label" id="ui_tpicker_hour_label_' + dp_id + '" ' +
302+ '<dt class="ui_tpicker_hour_label"' +
305303 ( ( o . showHour ) ? '' : noDisplay ) + '>' + o . hourText + '</dt>' ,
306304 hourGridSize = 0 ,
307305 minuteGridSize = 0 ,
@@ -310,7 +308,7 @@ $.extend(Timepicker.prototype, {
310308 size = null ;
311309
312310 // Hours
313- html += '<dd class="ui_tpicker_hour"><div id="ui_tpicker_hour_' + dp_id + ' "' +
311+ html += '<dd class="ui_tpicker_hour"><div class="ui_tpicker_hour_slider "' +
314312 ( ( o . showHour ) ? '' : noDisplay ) + '></div>' ;
315313 if ( o . showHour && o . hourGrid > 0 ) {
316314 html += '<div style="padding-left: 1px"><table class="ui-tpicker-grid-label"><tr>' ;
@@ -335,9 +333,9 @@ $.extend(Timepicker.prototype, {
335333 html += '</dd>' ;
336334
337335 // Minutes
338- html += '<dt class="ui_tpicker_minute_label" id="ui_tpicker_minute_label_' + dp_id + '" ' +
336+ html += '<dt class="ui_tpicker_minute_label"' +
339337 ( ( o . showMinute ) ? '' : noDisplay ) + '>' + o . minuteText + '</dt>' +
340- '<dd class="ui_tpicker_minute"><div id="ui_tpicker_minute_' + dp_id + ' "' +
338+ '<dd class="ui_tpicker_minute"><div class="ui_tpicker_minute_slider "' +
341339 ( ( o . showMinute ) ? '' : noDisplay ) + '></div>' ;
342340
343341 if ( o . showMinute && o . minuteGrid > 0 ) {
@@ -353,9 +351,9 @@ $.extend(Timepicker.prototype, {
353351 html += '</dd>' ;
354352
355353 // Seconds
356- html += '<dt class="ui_tpicker_second_label" id="ui_tpicker_second_label_' + dp_id + '" ' +
354+ html += '<dt class="ui_tpicker_second_label"' +
357355 ( ( o . showSecond ) ? '' : noDisplay ) + '>' + o . secondText + '</dt>' +
358- '<dd class="ui_tpicker_second"><div id="ui_tpicker_second_' + dp_id + ' "'+
356+ '<dd class="ui_tpicker_second"><div class="ui_tpicker_second_slider "' +
359357 ( ( o . showSecond ) ? '' : noDisplay ) + '></div>' ;
360358
361359 if ( o . showSecond && o . secondGrid > 0 ) {
@@ -371,9 +369,9 @@ $.extend(Timepicker.prototype, {
371369 html += '</dd>' ;
372370
373371 // Milliseconds
374- html += '<dt class="ui_tpicker_millisec_label" id="ui_tpicker_millisec_label_' + dp_id + '" ' +
372+ html += '<dt class="ui_tpicker_millisec_label"' +
375373 ( ( o . showMillisec ) ? '' : noDisplay ) + '>' + o . millisecText + '</dt>' +
376- '<dd class="ui_tpicker_millisec"><div id="ui_tpicker_millisec_' + dp_id + ' "'+
374+ '<dd class="ui_tpicker_millisec"><div class="ui_tpicker_millisec_slider "' +
377375 ( ( o . showMillisec ) ? '' : noDisplay ) + '></div>' ;
378376
379377 if ( o . showMillisec && o . millisecGrid > 0 ) {
@@ -389,9 +387,9 @@ $.extend(Timepicker.prototype, {
389387 html += '</dd>' ;
390388
391389 // Timezone
392- html += '<dt class="ui_tpicker_timezone_label" id="ui_tpicker_timezone_label_' + dp_id + '" ' +
390+ html += '<dt class="ui_tpicker_timezone_label"' +
393391 ( ( o . showTimezone ) ? '' : noDisplay ) + '>' + o . timezoneText + '</dt>' ;
394- html += '<dd class="ui_tpicker_timezone" id="ui_tpicker_timezone_' + dp_id + '" ' +
392+ html += '<dd class="ui_tpicker_timezone" ' +
395393 ( ( o . showTimezone ) ? '' : noDisplay ) + '></dd>' ;
396394
397395 html += '</dl></div>' ;
@@ -406,7 +404,7 @@ $.extend(Timepicker.prototype, {
406404 $dp . find ( '.ui-datepicker-header, .ui-datepicker-calendar' ) . hide ( ) ;
407405 }
408406
409- this . hour_slider = $tp . find ( '#ui_tpicker_hour_' + dp_id ) . slider ( {
407+ this . hour_slider = $tp . find ( '.ui_tpicker_hour_slider' ) . slider ( {
410408 orientation : "horizontal" ,
411409 value : this . hour ,
412410 min : o . hourMin ,
@@ -421,7 +419,7 @@ $.extend(Timepicker.prototype, {
421419
422420 // Updated by Peter Medeiros:
423421 // - Pass in Event and UI instance into slide function
424- this . minute_slider = $tp . find ( '#ui_tpicker_minute_' + dp_id ) . slider ( {
422+ this . minute_slider = $tp . find ( '.ui_tpicker_minute_slider' ) . slider ( {
425423 orientation : "horizontal" ,
426424 value : this . minute ,
427425 min : o . minuteMin ,
@@ -433,7 +431,7 @@ $.extend(Timepicker.prototype, {
433431 }
434432 } ) ;
435433
436- this . second_slider = $tp . find ( '#ui_tpicker_second_' + dp_id ) . slider ( {
434+ this . second_slider = $tp . find ( '.ui_tpicker_second_slider' ) . slider ( {
437435 orientation : "horizontal" ,
438436 value : this . second ,
439437 min : o . secondMin ,
@@ -445,7 +443,7 @@ $.extend(Timepicker.prototype, {
445443 }
446444 } ) ;
447445
448- this . millisec_slider = $tp . find ( '#ui_tpicker_millisec_' + dp_id ) . slider ( {
446+ this . millisec_slider = $tp . find ( '.ui_tpicker_millisec_slider' ) . slider ( {
449447 orientation : "horizontal" ,
450448 value : this . millisec ,
451449 min : o . millisecMin ,
@@ -457,7 +455,7 @@ $.extend(Timepicker.prototype, {
457455 }
458456 } ) ;
459457
460- this . timezone_select = $tp . find ( '#ui_tpicker_timezone_' + dp_id ) . append ( '<select></select>' ) . find ( "select" ) ;
458+ this . timezone_select = $tp . find ( '.ui_tpicker_timezone' ) . append ( '<select></select>' ) . find ( "select" ) ;
461459 $ . fn . append . apply ( this . timezone_select ,
462460 $ . map ( o . timezoneList , function ( val , idx ) {
463461 return $ ( "<option />" )
@@ -579,7 +577,7 @@ $.extend(Timepicker.prototype, {
579577 if ( $buttonPanel . length ) { $buttonPanel . before ( $tp ) ; }
580578 else { $dp . append ( $tp ) ; }
581579
582- this . $timeObj = $tp . find ( '#ui_tpicker_time_' + dp_id ) ;
580+ this . $timeObj = $tp . find ( '.ui_tpicker_time' ) ;
583581
584582 if ( this . inst !== null ) {
585583 var timeDefined = this . timeDefined ;
0 commit comments