From 08099e4fe1e56308bc42cc639d187863088494bd Mon Sep 17 00:00:00 2001
From: Andreas Gohr <andi@splitbrain.org>
Date: Tue, 18 Aug 2015 19:28:45 +0200
Subject: [PATCH] Form: correctly set type attribute for inputs #1312
---
_test/tests/inc/form/checkableelement.test.php | 2 ++
_test/tests/inc/form/inputelement.test.php | 17 +++++++++++++++++
inc/Form/InputElement.php | 1 +
3 files changed, 20 insertions(+)
diff --git a/_test/tests/inc/form/checkableelement.test.php b/_test/tests/inc/form/checkableelement.test.php
index a0e4173e8..e1491f6ec 100644
--- a/_test/tests/inc/form/checkableelement.test.php
+++ b/_test/tests/inc/form/checkableelement.test.php
@@ -23,6 +23,7 @@ class form_checkableelement_test extends DokuWikiTest {
$this->assertEquals('second', pq($inputs->elements[1])->val());
$this->assertEquals('checked', pq($inputs->elements[0])->attr('checked'));
$this->assertEquals('', pq($inputs->elements[1])->attr('checked'));
+ $this->assertEquals('radio', pq($inputs->elements[0])->attr('type'));
}
/**
@@ -45,5 +46,6 @@ class form_checkableelement_test extends DokuWikiTest {
$this->assertEquals('second', pq($inputs->elements[1])->val());
$this->assertEquals('', pq($inputs->elements[0])->attr('checked'));
$this->assertEquals('checked', pq($inputs->elements[1])->attr('checked'));
+ $this->assertEquals('radio', pq($inputs->elements[0])->attr('type'));
}
}
diff --git a/_test/tests/inc/form/inputelement.test.php b/_test/tests/inc/form/inputelement.test.php
index 7a5e6d2ea..3257d2a89 100644
--- a/_test/tests/inc/form/inputelement.test.php
+++ b/_test/tests/inc/form/inputelement.test.php
@@ -14,6 +14,7 @@ class form_inputelement_test extends DokuWikiTest {
$input = $pq->find('input[name=foo]');
$this->assertTrue($input->length == 1);
$this->assertEquals('this is text', $input->val());
+ $this->assertEquals('text', $input->attr('type'));
$label = $pq->find('label');
$this->assertTrue($label->length == 1);
@@ -38,4 +39,20 @@ class form_inputelement_test extends DokuWikiTest {
$this->assertEquals('a new text', $input->val());
}
+ function test_password() {
+ $form = new Form\Form();
+ $form->addPasswordInput('foo', 'label text')->val('this is text');
+
+ $html = $form->toHTML();
+ $pq = phpQuery::newDocumentXHTML($html);
+
+ $input = $pq->find('input[name=foo]');
+ $this->assertTrue($input->length == 1);
+ $this->assertEquals('this is text', $input->val());
+ $this->assertEquals('password', $input->attr('type'));
+
+ $label = $pq->find('label');
+ $this->assertTrue($label->length == 1);
+ $this->assertEquals('label text', $label->find('span')->text());
+ }
}
diff --git a/inc/Form/InputElement.php b/inc/Form/InputElement.php
index 5908f7d11..693eeffc5 100644
--- a/inc/Form/InputElement.php
+++ b/inc/Form/InputElement.php
@@ -29,6 +29,7 @@ class InputElement extends Element {
public function __construct($type, $name, $label = '') {
parent::__construct($type, array('name' => $name));
$this->attr('name', $name);
+ $this->attr('type', $type);
if($label) $this->label = new Label($label);
}
--
GitLab