|
146 | 146 |
|
147 | 147 | /* End Added by Peter Medeiros */
|
148 | 148 |
|
149 |
| - // Prevent displaying twice |
150 |
| - if ($dp.find("div#ui-timepicker-div").length == 0) { |
| 149 | + // Prevent displaying twice, changed to support inline datepickers (am I right here?) |
| 150 | + if (dp_inst.dpDiv.find('div#ui-timepicker-div').length == 0) { |
| 151 | + //if ($dp.find("div#ui-timepicker-div").length == 0) { |
151 | 152 | var html = '<div id="ui-timepicker-div">' +
|
152 | 153 | '<dl>' +
|
153 | 154 | '<dt id="ui_tpicker_time_label"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.time + '</dt>' +
|
154 |
| - '<dd id="ui_tpicker_time"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '></dd>' + |
| 155 | + '<dd class="ui-tpicker-time" id="ui_tpicker_time"' + ((tp_inst.defaults.showTime) ? '' : ' style="display:none;"') + '></dd>' + |
155 | 156 | '<dt id="ui_tpicker_hour_label"' + ((tp_inst.defaults.showHour) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.hour + '</dt>' +
|
156 | 157 | '<dd id="ui_tpicker_hour"' + ((tp_inst.defaults.showHour) ? '' : ' style="display:none;"') + '></dd>' +
|
157 | 158 | '<dt id="ui_tpicker_minute_label"' + ((tp_inst.defaults.showMinute) ? '' : ' style="display:none;"') + '>' + tp_inst.defaults.locale.minute + '</dt>' +
|
|
165 | 166 |
|
166 | 167 | if (tp_inst.defaults.timeOnly == true) { // if we only want time picker
|
167 | 168 | $tp.prepend('<div class="ui-widget-header ui-helper-clearfix ui-corner-all"><div class="ui-datepicker-title">' + tp_inst.defaults.locale.chooseTime + '</div></div>');
|
168 |
| - $dp.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide(); |
| 169 | + dp_inst.dpDiv.find('.ui-datepicker-header, .ui-datepicker-calendar, .ui-datepicker-current').hide(); |
169 | 170 | }
|
170 | 171 |
|
171 | 172 | tp_inst.hour_slider = $tp.find('#ui_tpicker_hour').slider({ orientation: "horizontal", value: tp_inst.hour, min:0, max: hourMax, step: tp_inst.defaults.stepHour, slide: function(event, ui) {
|
|
185 | 186 | tp_inst.onTimeChange(dp_inst, tp_inst);
|
186 | 187 | } });
|
187 | 188 |
|
188 |
| - $dp.find('.ui-datepicker-calendar').after($tp); |
189 |
| - tp_inst.$timeObj = $('#ui_tpicker_time'); |
| 189 | + // changed to support inline datepickers |
| 190 | + dp_inst.dpDiv.find('.ui-datepicker-calendar').after($tp); |
| 191 | + tp_inst.$timeObj = dp_inst.dpDiv.find('.ui-tpicker-time'); |
190 | 192 |
|
191 | 193 | if (dp_inst != null) {
|
192 |
| - |
193 | 194 | var timeDefined = tp_inst.timeDefined;
|
194 | 195 |
|
195 | 196 | tp_inst.onTimeChange(dp_inst, tp_inst);
|
|
0 commit comments