Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions DependencyInjection/Configuration.php
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ private function addPicker(ArrayNodeDefinition $rootNode)
->treatTrueLike(array('enabled' => true))
->children()
->booleanNode('enabled')->defaultTrue()->end()
->booleanNode('auto_include_assets')->defaultFalse()->end()
->arrayNode('configs')
->addDefaultsIfNotSet()
->children()
Expand Down
1 change: 0 additions & 1 deletion DependencyInjection/SCDatetimepickerExtension.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ public function load(array $configs, ContainerBuilder $container)

$this->$method($configs["picker"], $container);
}

}

/**
Expand Down
2 changes: 2 additions & 0 deletions Form/Type/DatetimeType.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public function buildView(FormView $view, FormInterface $form, array $options)
}

$view->vars = array_replace($view->vars, array(
'includeCSS' => $options['auto_include_assets'],
'includeJS' => $options['auto_include_assets'],
'pickerOptions' => $pickerOptions,
));
}
Expand Down
19 changes: 17 additions & 2 deletions Resources/public/js/bootstrap-datetimepicker.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* =========================================================
/* =========================================================
* bootstrap-datetimepicker.js
* =========================================================
* Copyright 2012 Stefan Petre
Expand Down Expand Up @@ -199,9 +199,11 @@
this.weekEnd = ((this.weekStart + 6) % 7);
this.startDate = -Infinity;
this.endDate = Infinity;
this.datesDisabled = [];
this.daysOfWeekDisabled = [];
this.setStartDate(options.startDate || this.element.data('date-startdate'));
this.setEndDate(options.endDate || this.element.data('date-enddate'));
this.setDatesDisabled(options.datesDisabled || this.element.data('date-dates-disabled'));
this.setDaysOfWeekDisabled(options.daysOfWeekDisabled || this.element.data('date-days-of-week-disabled'));
this.fillDow();
this.fillMonths();
Expand Down Expand Up @@ -405,6 +407,18 @@
this.updateNavArrows();
},

setDatesDisabled: function (datesDisabled) {
this.datesDisabled = datesDisabled || [];
if (!$.isArray(this.datesDisabled)) {
this.datesDisabled = this.datesDisabled.split(/,\s*/);
}
this.datesDisabled = $.map(this.datesDisabled, function (d) {
return DPGlobal.parseDate(d, this.format, this.language, this.formatType).toDateString();
});
this.update();
this.updateNavArrows();
},

setDaysOfWeekDisabled: function (daysOfWeekDisabled) {
this.daysOfWeekDisabled = daysOfWeekDisabled || [];
if (!$.isArray(this.daysOfWeekDisabled)) {
Expand Down Expand Up @@ -572,7 +586,8 @@
clsName += ' active';
}
if ((prevMonth.valueOf() + 86400000) <= this.startDate || prevMonth.valueOf() > this.endDate ||
$.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1) {
$.inArray(prevMonth.getUTCDay(), this.daysOfWeekDisabled) !== -1 ||
$.inArray(prevMonth.toDateString(), this.datesDisabled) !== -1) {
clsName += ' disabled';
}
html.push('<td class="day' + clsName + '">' + prevMonth.getUTCDate() + '</td>');
Expand Down
3 changes: 2 additions & 1 deletion Resources/public/js/bootstrap-datetimepicker.min.js

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions Resources/views/Form/jquery_layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
{% block collot_datetime_javascript %}
{% spaceless %}

{% if includeJS %}
<script type="text/javascript" src="{{ asset('bundles/scdatetimepicker/js/bootstrap-datetimepicker.min.js') }}" charset="UTF-8"></script>
{% if pickerOptions.language is defined %}
<script type="text/javascript" src="{{ asset('bundles/scdatetimepicker/js/locales/bootstrap-datetimepicker.'~ pickerOptions.language ~'.js') }}" charset="UTF-8"></script>
{% endif %}

{% endif %}

<script type="text/javascript">
jQuery(document).ready(function($) {
$field = $('#{% if widget != "single_text" %}datepicker_{% endif %}{{ id }}');

{% block collot_datetime_javascript_prototype %}

{% if widget != "single_text" %}
Expand All @@ -36,11 +38,11 @@
}
{% endif %}

$field.datetimepicker({{ pickerOptions|json_encode|raw }});
$field.datetimepicker({{ pickerOptions|json_encode|raw }});

{% endblock %}
});
</script>

{% endspaceless %}
{% endblock %}
2 changes: 2 additions & 0 deletions Resources/views/Form/stylesheet_layout.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

{% block collot_datetime_stylesheet %}
{% spaceless %}
{% if includeCSS %}
<link href="{{ asset('bundles/scdatetimepicker/css/datetimepicker.css') }}" rel="stylesheet" media="screen">
{% endif %}
{% endspaceless %}
{% endblock collot_datetime_stylesheet %}