tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Removed tabindex settings on DMYDateField, they were messing up the tab order in day/month/year fields (merged from branches/2.3-nzct)

Browse Source 
BUGFIX Removed "numeric" class on day/month/year fields in DMYField, the auto-magic NumericField? javascript resetting thats triggered onkeyup() is just a bit too much for its own good (merged from branches/2.3-nzct)
BUGFIX Removed hiddenfield dependency on DMYDateField, save into three distinct input fields and validate accordingly. All underlying logic already works with this notation. (merged from branches/2.3-nzct)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@82062 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-07-16 23:54:25 +00:00
parent 11b30e8db9
commit 485eca829b
1 changed files with 41 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
forms/DMYDateField.php
View File

@ -20,11 +20,6 @@ class DMYDateField extends CalendarDateField {
}
function Field() {
Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar.js");
Requirements::javascript(THIRDPARTY_DIR . "/calendar/lang/calendar-en.js");
Requirements::javascript(THIRDPARTY_DIR . "/calendar/calendar-setup.js");
Requirements::css(SAPPHIRE_DIR . "/css/CalendarDateField.css");
Requirements::css(THIRDPARTY_DIR . "/calendar/calendar-win2k-1.css");
Requirements::javascript(SAPPHIRE_DIR . "/javascript/CalendarDateField.js");
$field = DateField::Field();
@ -49,16 +44,11 @@ class DMYDateField extends CalendarDateField {
$fieldName = $this->name;
$tabIndex0 = $this->getTabIndexHTML(0);
$tabIndex1 = $this->getTabIndexHTML(1);
$tabIndex2 = $this->getTabIndexHTML(2);
return <<<HTML
<div class="dmycalendardate">
<input type="hidden" id="$id" name="{$this->name}" value="$val" />
<input type="text" id="$id-day" class="day numeric" name="{$fieldName}[Day]" value="$day" maxlength="2"$tabIndex0 />/
<input type="text" id="$id-month" class="month numeric" name="{$fieldName}[Month]" value="$month" maxlength="2"$tabIndex1 />/
<input type="text" id="$id-year" class="year numeric" name="{$fieldName}[Year]" value="$year" maxlength="4"$tabIndex2 />
<input type="text" id="$id-day" class="day" name="{$fieldName}[Day]" value="$day" maxlength="2" />/
<input type="text" id="$id-month" class="month" name="{$fieldName}[Month]" value="$month" maxlength="2" />/
<input type="text" id="$id-year" class="year" name="{$fieldName}[Year]" value="$year" maxlength="4" />
<div class="calendarpopup" id="{$id}-calendar"></div>
</div>
HTML;
@ -78,5 +68,43 @@ HTML;
}
return true;
}
function jsValidation() {
$formID = $this->form->FormName();
$error = _t('DateField.VALIDATIONJS', 'Please enter a valid date format (DD/MM/YYYY).');
$jsFunc =<<<JS
Behaviour.register({
"#$formID": {
validateDMYDate: function(fieldName) {
var value = \$F(_CURRENT_FORM.elements[fieldName+'[Day]'])
+ '/'
+ \$F(_CURRENT_FORM.elements[fieldName+'[Month]'])
+ '/'
+ \$F(_CURRENT_FORM.elements[fieldName+'[Year]'])
;
if(value && value.length > 0 && !value.match(/^[0-9]{1,2}\/[0-9]{1,2}\/[0-90-9]{2,4}\$/)) {
validationError(_CURRENT_FORM.elements[fieldName+'[Day]'],"$error","validation",false);
return false;
}
return true;
}
}
});
JS;
Requirements :: customScript($jsFunc, 'func_validateDMYDate_'.$formID);
// return "\$('$formID').validateDate('$this->name');";
return <<<JS
if(\$('$formID')){
if(typeof fromAnOnBlur != 'undefined'){
if(fromAnOnBlur.name == '$this->name')
\$('$formID').validateDMYDate('$this->name');
}else{
\$('$formID').validateDMYDate('$this->name');
}
}
JS;
}
}
?>