TextBase: fixed setEmptyValue() and space at the end of the string [Closes #35]

Author: chemix

src/Forms/Controls/TextBase.php

@@ -8,7 +8,8 @@
 namespace Nette\Forms\Controls;
 
 use Nette,
-	Nette\Forms\Form;
+	Nette\Forms\Form,
+	Nette\Utils\Strings;
 
 
 /**
@@ -55,12 +56,12 @@ public function getValue()
 	{
 		$value = $this->value;
 		if (!empty($this->control->maxlength)) {
-			$value = Nette\Utils\Strings::substring($value, 0, $this->control->maxlength);
+			$value = Strings::substring($value, 0, $this->control->maxlength);
 		}
 		foreach ($this->filters as $filter) {
 			$value = (string) call_user_func($filter, $value);
 		}
-		return $value === $this->translate($this->emptyValue) ? '' : $value;
+		return $value === Strings::trim($this->translate($this->emptyValue)) ? '' : $value;
 	}
 
 
@@ -115,7 +116,7 @@ public function getControl()
 	{
 		$el = parent::getControl();
 		if ($this->emptyValue !== '') {
-			$el->attrs['data-nette-empty-value'] = $this->translate($this->emptyValue);
+			$el->attrs['data-nette-empty-value'] = Strings::trim($this->translate($this->emptyValue));
 		}
 		if (isset($el->placeholder)) {
 			$el->placeholder = $this->translate($el->placeholder);

tests/Forms/Controls.TextBase.loadData.phpt

@@ -49,6 +49,17 @@ test(function() { // empty value
 });
 
 
+test(function() { // empty value
+	$_POST = array('phone' => '+420 ');
+
+	$form = new Form;
+	$input = $form->addText('phone')
+		->setEmptyValue('+420 ');
+
+	Assert::same( '', $input->getValue() );
+});
+
+
 test(function() { // invalid UTF
 	$_POST = array('invalidutf' => "invalid\xAA\xAA\xAAutf");
 

tests/Forms/Controls.TextInput.render.phpt

@@ -157,9 +157,9 @@ test(function() { // validation rule RANGE with setType
 test(function() { // setEmptyValue
 	$form = new Form;
 	$input = $form->addText('text')
-		->setEmptyValue('empty');
+		->setEmptyValue('empty ');
 
-	Assert::same('<input type="text" name="text" id="frm-text" data-nette-empty-value="empty" value="empty">', (string) $input->getControl());
+	Assert::same('<input type="text" name="text" id="frm-text" data-nette-empty-value="empty" value="empty ">', (string) $input->getControl());
 });