HtmlDropdown + combo buttongroups

Author: jcheron

Ajax/common/html/BaseHtml.php

@@ -104,6 +104,7 @@ protected function removeOldValues(&$oldValue, $allValues) {
 
 	protected function _getElementBy($callback,$elements){
 		if (\is_array($elements)) {
+			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
 			while ( !$flag && $index < sizeof($elements) ) {

Ajax/semantic/html/elements/HtmlButtonGroups.php

@@ -5,6 +5,7 @@
 use Ajax\semantic\html\base\HtmlSemDoubleElement;
 use Ajax\semantic\html\base\HtmlSemCollection;
 use Ajax\JsUtils;
+use Ajax\semantic\html\modules\HtmlDropdown;
 
 /**
  * Semantic UI Buttongroups component
@@ -24,6 +25,16 @@ protected function createItem($value){
 		return new HtmlButton("", $value);
 	}
 
+	public function addDropdown($items,$asCombo=false){
+		$dd= new HtmlDropdown("dd-".$this->identifier,null,$items);
+		$dd->asButton();
+		if($asCombo){
+			$dd->setAction("combo");
+			$dd->addToProperty("class", "combo");
+		}
+		return $this->addElement($dd);
+	}
+
 
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);

Ajax/semantic/html/modules/HtmlDropdown.php

@@ -28,11 +28,15 @@ public function __construct($identifier, $value="", $items=array(),$associative=
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
-		$content=new HtmlSemDoubleElement("text-".$this->identifier,"div");
-		$content->setClass("text");
-		$this->setValue($value);
-		$content->wrap("",new HtmlIcon("", "dropdown"));
-		$this->content=array($content);
+		$content=[];
+		if(isset($value)){
+			$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+			$text->setClass("text");
+			$content=[$text];
+			$this->setValue($value);
+		}
+		$content["arrow"]=new HtmlIcon("", "dropdown");
+		$this->content=$content;
 		$this->tagName="div";
 		$this->_associative=$associative;
 		$this->addItems($items);
@@ -53,6 +57,7 @@ public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
 	}
 
 	public function addIcon($icon,$before=true,$labeled=false){
+		$this->removeArrow();
 		$this->addIconP($icon,$before,$labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
@@ -79,6 +84,13 @@ public function insertItem($item,$position=0){
 		 return $itemO;
 	}
 
+	protected function removeArrow(){
+		if(\sizeof($this->content)>1){
+			unset($this->content["arrow"]);
+			$this->content=\array_values($this->content);
+		}
+	}
+
 	protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){
 		$itemO=$item;
 		if(\is_array($item)){
@@ -205,6 +217,7 @@ public function setSimple(){
 	}
 
 	public function asButton($floating=false){
+		$this->removeArrow();
 		if($floating)
 			$this->addToProperty("class", "floating");
 		$this->removePropertyValue("class", "selection");
@@ -308,5 +321,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
 	public function getInput() {
 		return $this->input;
 	}
-
+	public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) {
+		return $this->_addAction($this, $action,$direction,$icon,$labeled);
+	}
 }

Ajax/semantic/widgets/datatable/DataTable.php

@@ -202,7 +202,10 @@ protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL)
 	}
 
 	protected function _getFieldName($index){
-		return parent::_getFieldName($index)."[]";
+		$fieldName=parent::_getFieldName($index);
+		if(\is_object($fieldName))
+			$fieldName="field-".$index;
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index){