Merge pull request #49 from JerseyMilker/improve-element

Element improvements.
adamwathan · Jun 10, 2015 · b9f9a48 · b9f9a48
2 parents d4ac77d + a72b700
commit b9f9a48
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/src/AdamWathan/Form/Elements/Element.php b/src/AdamWathan/Form/Elements/Element.php
@@ -18,6 +18,11 @@ protected function removeAttribute($attribute)
         unset($this->attributes[$attribute]);
     }
 
+    public function type()
+    {
+        return $this->attributes['type'];
+    }
+
     public function data($attribute, $value)
     {
         $this->setAttribute('data-'.$attribute, $value);
@@ -55,7 +60,13 @@ public function removeClass($class)
         if (! isset($this->attributes['class'])) {
             return $this;
         }
+
         $class = trim(str_replace($class, '', $this->attributes['class']));
+        if ($class == '') {
+            $this->removeAttribute('class');
+            return $this;
+        }
+
         $this->setAttribute('class', $class);
         return $this;
     }

diff --git a/tests/FormBuilderTest.php b/tests/FormBuilderTest.php
@@ -526,6 +526,20 @@ public function testAgainstXSSAttacksInBoundModels()
 		$this->assertEquals($expected, $result);
 	}
 
+	public function testRemoveClass()
+	{
+		$expected = '<input type="text" name="food">';
+		$result = (string)$this->form->text('food')->addClass('sandwich pizza')->removeClass('sandwich')->removeClass('pizza');
+		$this->assertEquals($expected, $result);
+	}
+
+	public function testGetTypeAttribute()
+	{
+		$expected = 'radio';
+		$result = $this->form->radio('fm-transmission')->type();
+		$this->assertEquals($expected, $result);
+	}
+
 	private function getStubObject()
 	{
 		$obj = new stdClass;