Merge pull request #332 from spekulatius/converting-spaces-to-tabs

converting spaces as intentation to tabs
This commit is contained in:
Christopher Pitt 2015-09-11 07:30:16 +12:00
commit fd1f038cff
5 changed files with 18 additions and 18 deletions

View File

@ -554,7 +554,7 @@ EOS;
}
// Only add customScript if $default or $rules is defined
if($default || $rules) {
if($default || $rules) {
Requirements::customScript(<<<JS
(function($) {
$(document).ready(function() {

View File

@ -41,9 +41,9 @@ class EditableFileField extends EditableFormField {
);
$fields->addFieldToTab("Root.Main", new LiteralField("FileUploadWarning",
"<p class=\"message notice\">" . _t("UserDefinedForm.FileUploadWarning",
"Files uploaded through this field could be publicly accessible if the exact URL is known")
. "</p>"), "Type");
"<p class=\"message notice\">" . _t("UserDefinedForm.FileUploadWarning",
"Files uploaded through this field could be publicly accessible if the exact URL is known")
. "</p>"), "Type");
return $fields;
}

View File

@ -558,7 +558,7 @@ class EditableFormField extends DataObject {
TextField::create('CustomErrorMessage', _t('EditableFormField.CUSTOMERROR','Custom Error Message'))
);
$this->extend('updateFieldValidationOptions', $fields);
$this->extend('updateFieldValidationOptions', $fields);
return $fields;
}

View File

@ -88,6 +88,6 @@ class EditableFormHeading extends EditableFormField {
}
public function getLevel() {
return $this->getField('Level') ?: 3;
}
return $this->getField('Level') ?: 3;
}
}

View File

@ -17,7 +17,7 @@ class EditableTextField extends EditableFormField {
'MinLength' => 'Int',
'MaxLength' => 'Int',
'Rows' => 'Int(1)',
'Placeholder' => 'Varchar(255)'
'Placeholder' => 'Varchar(255)'
);
private static $defaults = array(
@ -37,13 +37,13 @@ class EditableTextField extends EditableFormField {
))
);
$fields->addFieldToTab(
'Root.Main',
TextField::create(
'Placeholder',
_t('EditableTextField.PLACEHOLDER', 'Placeholder')
)
);
$fields->addFieldToTab(
'Root.Main',
TextField::create(
'Placeholder',
_t('EditableTextField.PLACEHOLDER', 'Placeholder')
)
);
});
return parent::getCMSFields();
@ -105,8 +105,8 @@ class EditableTextField extends EditableFormField {
$field->setAttribute('data-rule-maxlength', $this->MaxLength);
}
if($this->Placeholder) {
$field->setAttribute('placeholder', $this->Placeholder);
}
if($this->Placeholder) {
$field->setAttribute('placeholder', $this->Placeholder);
}
}
}