controls: added option 'type' for distinguishing between them

dg · dg · commit ffb3b6bd178f · 2016-01-11T17:00:44.000+01:00
diff --git a/src/Forms/Controls/Button.php b/src/Forms/Controls/Button.php
@@ -23,6 +23,7 @@ public function __construct($caption = NULL)
 	{
 		parent::__construct($caption);
 		$this->control->type = 'button';
+		$this->setOption('type', 'button');
 	}
 
 
diff --git a/src/Forms/Controls/Checkbox.php b/src/Forms/Controls/Checkbox.php
@@ -27,6 +27,7 @@ public function __construct($label = NULL)
 		parent::__construct($label);
 		$this->control->type = 'checkbox';
 		$this->wrapper = Nette\Utils\Html::el();
+		$this->setOption('type', 'checkbox');
 	}
 
 
diff --git a/src/Forms/Controls/CheckboxList.php b/src/Forms/Controls/CheckboxList.php
@@ -36,6 +36,7 @@ public function __construct($label = NULL, array $items = NULL)
 		$this->control->type = 'checkbox';
 		$this->container = Html::el();
 		$this->separator = Html::el('br');
+		$this->setOption('type', 'checkbox');
 	}
 
 
diff --git a/src/Forms/Controls/HiddenField.php b/src/Forms/Controls/HiddenField.php
@@ -23,6 +23,7 @@ public function __construct($persistentValue = NULL)
 	{
 		parent::__construct();
 		$this->control->type = 'hidden';
+		$this->setOption('type', 'hidden');
 		if ($persistentValue !== NULL) {
 			$this->unmonitor(Nette\Forms\Form::class);
 			$this->persistValue = TRUE;
diff --git a/src/Forms/Controls/MultiSelectBox.php b/src/Forms/Controls/MultiSelectBox.php
@@ -19,6 +19,13 @@ class MultiSelectBox extends MultiChoiceControl
 	private $options = [];
 
 
+	public function __construct($label = NULL, array $items = NULL)
+	{
+		parent::__construct($label, $items);
+		$this->setOption('type', 'select');
+	}
+
+
 	/**
 	 * Sets options and option groups from which to choose.
 	 * @return self
diff --git a/src/Forms/Controls/RadioList.php b/src/Forms/Controls/RadioList.php
@@ -44,6 +44,7 @@ public function __construct($label = NULL, array $items = NULL)
 		$this->container = Html::el();
 		$this->separator = Html::el('br');
 		$this->itemLabel = Html::el();
+		$this->setOption('type', 'radio');
 	}
 
 
diff --git a/src/Forms/Controls/SelectBox.php b/src/Forms/Controls/SelectBox.php
@@ -25,6 +25,13 @@ class SelectBox extends ChoiceControl
 	private $prompt = FALSE;
 
 
+	public function __construct($label = NULL, array $items = NULL)
+	{
+		parent::__construct($label, $items);
+		$this->setOption('type', 'select');
+	}
+
+
 	/**
 	 * Sets first prompt item in select box.
 	 * @param  string
diff --git a/src/Forms/Controls/TextArea.php b/src/Forms/Controls/TextArea.php
@@ -23,6 +23,7 @@ public function __construct($label = NULL)
 	{
 		parent::__construct($label);
 		$this->control->setName('textarea');
+		$this->setOption('type', 'textarea');
 	}
 
 
diff --git a/src/Forms/Controls/TextInput.php b/src/Forms/Controls/TextInput.php
@@ -26,6 +26,7 @@ public function __construct($label = NULL, $maxLength = NULL)
 		parent::__construct($label);
 		$this->control->type = 'text';
 		$this->control->maxlength = $maxLength;
+		$this->setOption('type', 'text');
 	}
 
 
diff --git a/src/Forms/Controls/UploadControl.php b/src/Forms/Controls/UploadControl.php
@@ -26,6 +26,7 @@ public function __construct($label = NULL, $multiple = FALSE)
 		parent::__construct($label);
 		$this->control->type = 'file';
 		$this->control->multiple = (bool) $multiple;
+		$this->setOption('type', 'file');
 	}
 
 
diff --git a/tests/Forms/Controls.Button.render.phpt b/tests/Forms/Controls.Button.render.phpt
@@ -111,6 +111,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addButton('button');
 
+	Assert::same('button', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.Checkbox.render.phpt b/tests/Forms/Controls.Checkbox.render.phpt
@@ -72,6 +72,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addCheckbox('on');
 
+	Assert::same('checkbox', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.CheckboxList.render.phpt b/tests/Forms/Controls.CheckboxList.render.phpt
@@ -171,6 +171,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addCheckboxList('list');
 
+	Assert::same('checkbox', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.CsrfProtection.phpt b/tests/Forms/Controls.CsrfProtection.phpt
@@ -25,6 +25,7 @@ Assert::same(['Security token did not match. Possible CSRF attack.'], $form->get
 Assert::null($input->getOption('rendered'));
 Assert::match('<input type="hidden" name="_token_" value="%S%">', (string) $input->getControl());
 Assert::true($input->getOption('rendered'));
+Assert::same('hidden', $input->getOption('type'));
 
 $input->setValue(NULL);
 Assert::false(CsrfProtection::validateCsrf($input));
diff --git a/tests/Forms/Controls.HiddenField.render.phpt b/tests/Forms/Controls.HiddenField.render.phpt
@@ -61,6 +61,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addHidden('hidden');
 
+	Assert::same('hidden', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.ImageButton.render.phpt b/tests/Forms/Controls.ImageButton.render.phpt
@@ -61,6 +61,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addImage('button');
 
+	Assert::same('button', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.MultiSelectBox.render.phpt b/tests/Forms/Controls.MultiSelectBox.render.phpt
@@ -125,6 +125,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addMultiSelect('list');
 
+	Assert::same('select', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.RadioList.render.phpt b/tests/Forms/Controls.RadioList.render.phpt
@@ -183,6 +183,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addRadioList('list');
 
+	Assert::same('radio', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.SelectBox.render.phpt b/tests/Forms/Controls.SelectBox.render.phpt
@@ -125,6 +125,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addSelect('list');
 
+	Assert::same('select', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.TextArea.render.phpt b/tests/Forms/Controls.TextArea.render.phpt
@@ -91,6 +91,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addTextArea('text');
 
+	Assert::same('textarea', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.TextInput.render.phpt b/tests/Forms/Controls.TextInput.render.phpt
@@ -185,6 +185,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addText('text');
 
+	Assert::same('text', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));
diff --git a/tests/Forms/Controls.UploadControl.render.phpt b/tests/Forms/Controls.UploadControl.render.phpt
@@ -74,6 +74,8 @@ test(function () { // rendering options
 	$form = new Form;
 	$input = $form->addUpload('file');
 
+	Assert::same('file', $input->getOption('type'));
+
 	Assert::null($input->getOption('rendered'));
 	$input->getControl();
 	Assert::true($input->getOption('rendered'));

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ public function __construct($caption = NULL)`
`23`	`23`	`{`
`24`	`24`	`parent::__construct($caption);`
`25`	`25`	`$this->control->type = 'button';`
	`26`	`+ $this->setOption('type', 'button');`
`26`	`27`	`}`
`27`	`28`
`28`	`29`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ public function __construct($label = NULL)`
`27`	`27`	`parent::__construct($label);`
`28`	`28`	`$this->control->type = 'checkbox';`
`29`	`29`	`$this->wrapper = Nette\Utils\Html::el();`
	`30`	`+ $this->setOption('type', 'checkbox');`
`30`	`31`	`}`
`31`	`32`
`32`	`33`
Original file line number	Diff line number	Diff line change
`@@ -36,6 +36,7 @@ public function __construct($label = NULL, array $items = NULL)`
`36`	`36`	`$this->control->type = 'checkbox';`
`37`	`37`	`$this->container = Html::el();`
`38`	`38`	`$this->separator = Html::el('br');`
	`39`	`+ $this->setOption('type', 'checkbox');`
`39`	`40`	`}`
`40`	`41`
`41`	`42`
Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ public function __construct($label = NULL, array $items = NULL)`
`44`	`44`	`$this->container = Html::el();`
`45`	`45`	`$this->separator = Html::el('br');`
`46`	`46`	`$this->itemLabel = Html::el();`
	`47`	`+ $this->setOption('type', 'radio');`
`47`	`48`	`}`
`48`	`49`
`49`	`50`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public function __construct($label = NULL, $maxLength = NULL)`
`26`	`26`	`parent::__construct($label);`
`27`	`27`	`$this->control->type = 'text';`
`28`	`28`	`$this->control->maxlength = $maxLength;`
	`29`	`+ $this->setOption('type', 'text');`
`29`	`30`	`}`
`30`	`31`
`31`	`32`