mirror of
https://github.com/jquery/jquery-ui.git
synced 2024-11-21 11:04:24 +00:00
datepicker: #4003 - Inline datepicker and button panel.
This commit is contained in:
parent
b388e6b8e1
commit
658a0f7f40
@ -1307,7 +1307,7 @@ $.extend(Datepicker.prototype, {
|
|||||||
var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
|
var gotoDate = (this._get(inst, 'gotoCurrent') && inst.currentDay ? currentDate : today);
|
||||||
currentText = (!navigationAsDateFormat ? currentText :
|
currentText = (!navigationAsDateFormat ? currentText :
|
||||||
this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
|
this.formatDate(currentText, gotoDate, this._getFormatConfig(inst)));
|
||||||
var controls = '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="jQuery.datepicker._hideDatepicker();">' + this._get(inst, 'closeText') + '</button>';
|
var controls = (!inst.inline ? '<button type="button" class="ui-datepicker-close ui-state-default ui-priority-primary ui-corner-all" onclick="jQuery.datepicker._hideDatepicker();">' + this._get(inst, 'closeText') + '</button>' : '');
|
||||||
var buttonPanel = (showButtonPanel) ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
|
var buttonPanel = (showButtonPanel) ? '<div class="ui-datepicker-buttonpane ui-widget-content">' + (isRTL ? controls : '') +
|
||||||
(this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="jQuery.datepicker._gotoToday(\'#' + inst.id + '\');"' +
|
(this._isInRange(inst, gotoDate) ? '<button type="button" class="ui-datepicker-current ui-state-default ui-priority-secondary ui-corner-all" onclick="jQuery.datepicker._gotoToday(\'#' + inst.id + '\');"' +
|
||||||
'>' + currentText + '</button>' : '') + (isRTL ? '' : controls) + '</div>' : '';
|
'>' + currentText + '</button>' : '') + (isRTL ? '' : controls) + '</div>' : '';
|
||||||
@ -1405,8 +1405,7 @@ $.extend(Datepicker.prototype, {
|
|||||||
}
|
}
|
||||||
html += group;
|
html += group;
|
||||||
}
|
}
|
||||||
html += (!inst.inline ? buttonPanel : '') +
|
html += buttonPanel + ($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
|
||||||
($.browser.msie && parseInt($.browser.version,10) < 7 && !inst.inline ?
|
|
||||||
'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
|
'<iframe src="javascript:false;" class="ui-datepicker-cover" frameborder="0"></iframe>' : '');
|
||||||
inst._keyEvent = false;
|
inst._keyEvent = false;
|
||||||
return html;
|
return html;
|
||||||
|
Loading…
Reference in New Issue
Block a user