tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-03 06:38:51 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #572 from burnbright/datefield-fix

Browse Source 
BUGFIX: DateField javascript fails when it is included in a GroupField
This commit is contained in:
Will Rossiter 2012-07-08 21:50:48 -07:00
commit 6b611c6825
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forms/DateField.php
View File

@ -121,6 +121,14 @@ class DateField extends TextField {
return $html;
}
function SmallFieldHolder($properties = array()){
$d = DateField_View_JQuery::create($this);
$d->onBeforeRender();
$html = parent::SmallFieldHolder($properties);
$html = $d->onAfterRender($html);
return $html;
}
function Field($properties = array()) {
$config = array(

2
javascript/DateField.js
View File

@ -26,7 +26,7 @@
}
});
$('.field.date input.text').live('click', function() {
$('.field.date input.text,.fieldholder-small input.text.date').live('click', function() {
$(this).ssDatepicker();
$(this).datepicker('show');
});