getDataField added

Author: jcheron

Ajax/semantic/html/collections/form/HtmlForm.php

@@ -160,7 +160,7 @@ private function addCompoValidation($js,$compo,$field){
 			if(isset($compo)===false){
 				$compo=$js->semantic()->form("#".$this->identifier);
 			}
-			$validation->setIdentifier($field->getField()->getIdentifier());
+			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;

Ajax/semantic/html/collections/form/HtmlFormField.php

@@ -60,6 +60,14 @@ public function getField(){
 		return $this->content["field"];
 	}
 
+	/**
+	 * Return the field with data
+	 * @return mixed
+	 */
+	public function getDataField(){
+		return $this->content["field"];
+	}
+
 	/**
 	 * puts the label before or behind
 	 */
@@ -111,7 +119,7 @@ public function setReadonly(){
 	}
 
 	public function addRule($type,$prompt=NULL,$value=NULL){
-		$field=$this->getField();
+		$field=$this->getDataField();
 		if(isset($field)){
 			if(!isset($this->_validation)){
 				$this->_validation=new FieldValidation($field->getIdentifier());

Ajax/semantic/html/collections/form/HtmlFormInput.php

@@ -2,9 +2,9 @@
 
 namespace Ajax\semantic\html\collections\form;
 
-use Ajax\common\html\html5\HtmlInput;
 use Ajax\semantic\html\collections\form\traits\TextFieldsTrait;
 use Ajax\semantic\html\collections\form\traits\FieldTrait;
+use Ajax\semantic\html\elements\HtmlInput;
 
 class HtmlFormInput extends HtmlFormField {
 	use TextFieldsTrait,FieldTrait;
@@ -14,4 +14,11 @@ public function __construct($identifier, $label=NULL,$type="text",$value=NULL,$p
 			$placeholder=$label;
 		parent::__construct("field-".$identifier, new HtmlInput($identifier,$type,$value,$placeholder), $label);
 	}
+
+	public function getDataField(){
+		$field= $this->getField();
+		if($field instanceof HtmlInput)
+			$field=$field->getField();
+		return $field;
+	}
 }

Ajax/semantic/html/collections/form/HtmlFormTextarea.php

@@ -22,4 +22,8 @@ public function __construct($identifier, $label=NULL,$value=NULL,$placeholder=NU
 	public function setRows($count){
 		$this->getField()->setRows($count);
 	}
+
+	public function getDataField() {
+		return $this->content["field"];
+	}
 }

Ajax/semantic/html/collections/form/traits/FieldTrait.php

@@ -56,7 +56,7 @@ public function setTransparent() {
 	}
 
 	public function setReadonly(){
-		$this->getField()->setProperty("readonly", "");
+		$this->getDataField()->setProperty("readonly", "");
 	}
 
 }

Ajax/semantic/html/collections/form/traits/TextFieldsTrait.php

@@ -4,14 +4,14 @@
 
 trait TextFieldsTrait {
 
-	public abstract function getField();
+	public abstract function getDataField();
 	public function setPlaceholder($value){
-		$this->getField()->setPlaceholder($value);
+		$this->getDataField()->setPlaceholder($value);
 		return $this;
 	}
 
 	public function setValue($value){
-		$this->getField()->setValue($value);
+		$this->getDataField()->setValue($value);
 		return $this;
 	}
 }

Ajax/semantic/html/elements/HtmlInput.php

@@ -22,6 +22,10 @@ public function getField() {
 		return $this->content["field"];
 	}
 
+	public function getDataField() {
+		return $this->getField();
+	}
+
 	public static function outline($identifier, $icon, $value="", $placeholder="") {
 		$result=new HtmlInput($identifier, "text", $value, $placeholder);
 		$result->addToProperty("class", "transparent");