Fix phpMv-UI bug site

Author: jcheron

Ajax/JsUtils.php

@@ -172,16 +172,21 @@ public function config($config=NULL) {
 	 * @param mixed $injected optional param for Symfony/Ubiquity
 	 */
 	public function __construct($params=array(),$injected=NULL) {
-		$defaults=['debug'=>true,'defer'=>false,'ajax'=>
-				['ajaxTransition'=>null,'attr'=>'','historize'=>false,'jsCallback'=>null,'hasLoader'=>true,'jqueryDone'=>'html',
-				'async'=>true,'params'=>null,'headers'=>null,'jsCondition'=>null,'ajaxLoader'=>null],
+		$ajaxDefault=['ajaxTransition'=>null,'attr'=>'','historize'=>false,'jsCallback'=>null,'hasLoader'=>true,'jqueryDone'=>'html',
+				'async'=>true,'params'=>null,'headers'=>null,'jsCondition'=>null,'ajaxLoader'=>null];
+		$defaults=['debug'=>true,'defer'=>false,'ajax'=>$ajaxDefault,
 				'historize'=>true,'autoActiveLinks'=>true
 		];
 		foreach ( $defaults as $key => $val ) {
 			if (isset($params[$key])===false || $params[$key]==="") {
 				$params[$key]=$defaults[$key];
 			}
 		}
+		foreach ( $ajaxDefault as $key=>$val){
+			if (isset($params["ajax"][$key])===false || $params["ajax"][$key]==="") {
+				$params["ajax"][$key]=$ajaxDefault[$key];
+			}
+		}
 
 		if(\array_key_exists("semantic", $params)){
 			$this->semantic(new Semantic());

Ajax/common/html/HtmlCollection.php

@@ -80,7 +80,7 @@ public function insertItem($item,$position=0){
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index))
+		if (is_int($index)&& isset($this->content[$index]))
 			return $this->content[$index];
 		else {
 			$elm=$this->getElementById($index, $this->content);

Ajax/common/html/traits/BaseHtmlPropertiesTrait.php

@@ -51,13 +51,11 @@ public function addToProperty($name, $value, $separator=" ") {
 		} else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) {
 			if(isset($this->_self->properties[$name])){
 				$v=$this->_self->properties[$name];
-				if (isset($v) && $v !== "")
-					$v=$v . $separator . $value;
-					else
-						$v=$value;
-	
-				return $this->_self->setProperty($name, $v);
+				if (isset($v) && $v !== ""){
+					$value=$v . $separator . $value;
+				}
 			}
+			return $this->_self->setProperty($name, $value);
 		}
 		return $this;
 	}

Ajax/semantic/html/collections/HtmlBreadcrumb.php

@@ -209,10 +209,6 @@ public function addItem($item) {
 		return $itemO;
 	}
 
-	public function asLinks() {
-		$this->contentAs("a");
-	}
-
 	public function asTexts() {
 		$this->contentAs("div");
 	}

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

@@ -117,7 +117,7 @@ public function setContainer($_container) {
 	}
 
 	public function setReadonly(){
-		$this->getField()->setProperty("readonly", "");
+		$this->getDataField()->setProperty("readonly", "");
 	}
 
 	public function addRule($type,$prompt=NULL,$value=NULL){

Ajax/semantic/html/content/HtmlAbsractItem.php

@@ -36,6 +36,9 @@ public function setImage($image){
 	}
 
 	private function _getContent($key="content",$baseClass="content"){
+		if(!is_array($this->content)){
+			$this->content=[$this->content];
+		}
 		if(\array_key_exists($key, $this->content)===false){
 			$this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier,"div",$baseClass);
 		}

Ajax/semantic/html/content/table/HtmlTR.php

@@ -123,7 +123,11 @@ public function mergeCol($colIndex=0) {
 	}
 
 	public function mergeRow($colIndex=0) {
-		return $this->getItem($colIndex)->mergeRow();
+		$row=$this->getItem($colIndex);
+		if(isset($row)){
+			$this->getItem($colIndex)->mergeRow();
+		}
+		return $this;
 	}
 
 	public function getColPosition($colIndex) {

Ajax/semantic/traits/SemanticWidgetsTrait.php

@@ -19,7 +19,7 @@ abstract public function addHtmlComponent(BaseHtml $htmlComponent);
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances){
+	public function dataTable($identifier,$model, $instances=null){
 		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
 	}
 
@@ -29,7 +29,7 @@ public function dataTable($identifier,$model, $instances){
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances){
+	public function jsonDataTable($identifier,$model, $instances=null){
 		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
 	}
 
@@ -38,7 +38,7 @@ public function jsonDataTable($identifier,$model, $instances){
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance){
+	public function dataElement($identifier, $instance=null){
 		return $this->addHtmlComponent(new DataElement($identifier,$instance));
 	}