phpMv / phpMv-UI

Ajax/semantic/html/elements/HtmlList.php

Spacing +34 added lines, -34 removed lines

@@ -21,17 +21,17 @@ 
 
 	protected function createItem($value) {
 		$count=$this->count();
-		$item=new HtmlListItem("item-" . $this->identifier . "-" . $count, $value);
+		$item=new HtmlListItem("item-".$this->identifier."-".$count, $value);
 		return $item;
 	}
 
 	public function addHeader($niveau, $content) {
-		$header=new HtmlHeader("header-" . $this->identifier, $niveau, $content, "page");
+		$header=new HtmlHeader("header-".$this->identifier, $niveau, $content, "page");
 		$this->wrap($header);
 		return $header;
 	}
 
-	public function getItemPart($index,$partName="header"){
+	public function getItemPart($index, $partName="header") {
 		return $this->getItem($index)->getPart($partName);
 	}
 
@@ -39,9 +39,9 @@ 
 		return $this->contentAs($tagName);
 	}
 
-	public function asLinks($hrefs=[],$target=NUll) {
-		$this->addToPropertyCtrl("class", "link", array ("link" ));
-		return parent::asLinks($hrefs,$target);
+	public function asLinks($hrefs=[], $target=NUll) {
+		$this->addToPropertyCtrl("class", "link", array("link"));
+		return parent::asLinks($hrefs, $target);
 	}
 
 	public function addList($items=array()) {
@@ -53,13 +53,13 @@ 
 	/**
 	 * @return HtmlListItem
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=parent::getItemToAdd($item);
-		if($itemO instanceof AbstractCheckbox)
+		if ($itemO instanceof AbstractCheckbox)
 			$itemO->addClass("item");
 		return $itemO;
 	}
@@ -77,9 +77,9 @@ 
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_hasCheckedList === true) {
-			$jsCode=include dirname(__FILE__) . '/../../components/jsTemplates/tplCheckedList.php';
-			$jsCode=\str_replace("%identifier%", "#" . $this->identifier, $jsCode);
+		if ($this->_hasCheckedList===true) {
+			$jsCode=include dirname(__FILE__).'/../../components/jsTemplates/tplCheckedList.php';
+			$jsCode=\str_replace("%identifier%", "#".$this->identifier, $jsCode);
 			$jsCode=\str_replace("%fireOnInit%", $this->_fireOnInit, $jsCode);
 			$jsCode=\str_replace("%onChange%", $this->_ckItemChange, $jsCode);
 			$this->executeOnRun($jsCode);
@@ -87,7 +87,7 @@ 
 		return parent::run($js);
 	}
 	
-	public function onCkItemChange($jsCode){
+	public function onCkItemChange($jsCode) {
 		$this->_ckItemChange=$jsCode;
 	}
 
@@ -95,7 +95,7 @@ 
 	 * @param boolean $fireOnInit
 	 */
 	public function setFireOnInit($fireOnInit) {
-		$this->_fireOnInit = $fireOnInit;
+		$this->_fireOnInit=$fireOnInit;
 	}
 
 	public function setRelaxed() {
@@ -122,42 +122,42 @@ 
 	 * @param string $notAllChecked
 	 * @return HtmlList
 	 */
-	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(),$notAllChecked=false,$name=null) {
+	public function addCheckedList($items=array(), $masterItem=NULL, $values=array(), $notAllChecked=false, $name=null) {
 		$count=$this->count();
-		$identifier=$this->identifier . "-" . $count;
+		$identifier=$this->identifier."-".$count;
 		if (isset($masterItem)) {
-			if(\is_array($masterItem)){
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, @$masterItem[0],@$masterItem[1]);
-				if(isset($name))
+			if (\is_array($masterItem)) {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, @$masterItem[0], @$masterItem[1]);
+				if (isset($name))
 					$masterO->setName($name);
-				if(isset($masterItem[1])){
-					if(\array_search($masterItem[1], $values)!==false){
+				if (isset($masterItem[1])) {
+					if (\array_search($masterItem[1], $values)!==false) {
 						$masterO->getDataField()->setProperty("checked", "");
 					}
 				}
-			}else{
-				$masterO=new HtmlFormCheckbox("master-" . $identifier, $masterItem);
+			} else {
+				$masterO=new HtmlFormCheckbox("master-".$identifier, $masterItem);
 			}
-			if($notAllChecked){
+			if ($notAllChecked) {
 				$masterO->getDataField()->addClass("_notAllChecked");
 			}
 			$masterO->getHtmlCk()->addToProperty("class", "master");
 			$masterO->setClass("item");
 			$this->addItem($masterO);
 		}
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
-			$itemO=new HtmlFormCheckbox($identifier . "-" . $i++, $caption, $val, "child");
-			if (\array_search($val, $values) !== false) {
+		foreach ($items as $val => $caption) {
+			$itemO=new HtmlFormCheckbox($identifier."-".$i++, $caption, $val, "child");
+			if (\array_search($val, $values)!==false) {
 				$itemO->getDataField()->setProperty("checked", "");
 			}
-			if(isset($name))
+			if (isset($name))
 				$itemO->setName($name);
 			$itemO->setClass("item");
 			$fields[]=$itemO;
 		}
-		if (isset($masterO) === true) {
+		if (isset($masterO)===true) {
 			$list=new HtmlList("", $fields);
 			$list->setClass("list");
 			$masterO->addContent($list);
@@ -168,12 +168,12 @@ 
 		return $this;
 	}
 
-	public function setIcons($icons){
-		if(!\is_array($icons)){
+	public function setIcons($icons) {
+		if (!\is_array($icons)) {
 			$icons=\array_fill(0, \sizeof($this->content), $icons);
 		}
-		$max=\min(\sizeof($icons),\sizeof($this->content));
-		for($i=0;$i<$max;$i++){
+		$max=\min(\sizeof($icons), \sizeof($this->content));
+		for ($i=0; $i<$max; $i++) {
 			$this->content[$i]->addIcon($icons[$i]);
 		}
 		return $this;

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

Spacing +7 added lines, -7 removed lines

@@ -35,7 +35,7 @@ 
 		}
 		if (isset($label))
 			$this->setLabel($label);
-		foreach ( $fields as $field ) {
+		foreach ($fields as $field) {
 			$this->addItem($field);
 		}
 		return $this;
@@ -57,7 +57,7 @@ 
 
 	public function addItem($item) {
 		$item=parent::addItem($item);
-		if($item instanceof HtmlFormField)
+		if ($item instanceof HtmlFormField)
 			$item->setContainer($this);
 		return $item;
 	}
@@ -65,7 +65,7 @@ 
 	/**
 	 * @return HtmlFormField
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -105,9 +105,9 @@ 
 
 
 	public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type);
 			if ($val===$value) {
 				$itemO->getDataField()->setProperty("checked", "");
@@ -121,9 +121,9 @@ 
 	}
 
 	public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) {
-		$fields=array ();
+		$fields=array();
 		$i=0;
-		foreach ( $items as $val => $caption ) {
+		foreach ($items as $val => $caption) {
 			$itemO=new HtmlFormCheckbox($name."-".$i++, $caption, $val, $type);
 			$itemO->setName($name);
 			if (\array_search($val, $values)!==false) {

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

Spacing +9 added lines, -9 removed lines

@@ -38,22 +38,22 @@ 
 		return $this->getHtmlCk()->attachEvents($events);
 	}
 
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
-	public function getHtmlCk(){
+	public function getHtmlCk() {
 		return $this->content["field"];
 	}
 
-	public function setName($name){
+	public function setName($name) {
 		$this->getDataField()->setProperty("name", $name);
 		return $this;
 	}
 
-	public function getDataField(){
-		$field= $this->getField();
-		if($field instanceof AbstractCheckbox)
+	public function getDataField() {
+		$field=$this->getField();
+		if ($field instanceof AbstractCheckbox)
 			$field=$field->getField();
 		return $field;
 	}
@@ -63,10 +63,10 @@ 
 	 * @param boolean $value
 	 * @return $this
 	 */
-	public function setChecked($value=true){
-		if($value===true){
+	public function setChecked($value=true) {
+		if ($value===true) {
 			$this->getDataField()->setProperty("checked", "checked");
-		}else{
+		} else {
 			$this->getDataField()->removeProperty("checked");
 		}
 		return $this;

Ajax/semantic/html/modules/HtmlDropdown.php

Spacing +98 added lines, -98 removed lines

@@ -15,29 +15,29 @@ 
 use Ajax\common\html\HtmlDoubleElement;
 
 class HtmlDropdown extends HtmlSemDoubleElement {
-	use FieldTrait,LabeledIconTrait {
+	use FieldTrait, LabeledIconTrait {
 		addIcon as addIconP;
 	}
 	protected $mClass="menu";
 	protected $mTagName="div";
-	protected $items=array ();
-	protected $_params=array("action"=>"nothing","on"=>"hover","showOnFocus"=>false);
+	protected $items=array();
+	protected $_params=array("action"=>"nothing", "on"=>"hover", "showOnFocus"=>false);
 	protected $input;
 	protected $value;
 	protected $_associative;
 	protected $_multiple;
 
-	public function __construct($identifier, $value="", $items=array(),$associative=true) {
+	public function __construct($identifier, $value="", $items=array(), $associative=true) {
 		parent::__construct($identifier, "div");
 		$this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php';
 		$this->setProperty("class", "ui dropdown");
 		$this->_multiple=false;
 		$content=[];
-		if(isset($value)){
-			if($value instanceof HtmlSemDoubleElement){
+		if (isset($value)) {
+			if ($value instanceof HtmlSemDoubleElement) {
 				$text=$value;
-			}else{
-				$text=new HtmlSemDoubleElement("text-".$this->identifier,"div");
+			} else {
+				$text=new HtmlSemDoubleElement("text-".$this->identifier, "div");
 				$text->setClass("text");
 				$this->setValue($value);
 			}
@@ -50,29 +50,29 @@ 
 		$this->addItems($items);
 	}
 
-	public function getField(){
+	public function getField() {
 		return $this->input;
 	}
 
-	public function getDataField(){
+	public function getDataField() {
 		return $this->input;
 	}
 
-	public function addItem($item,$value=NULL,$image=NULL,$description=NULL){
-		$itemO=$this->beforeAddItem($item,$value,$image,$description);
+	public function addItem($item, $value=NULL, $image=NULL, $description=NULL) {
+		$itemO=$this->beforeAddItem($item, $value, $image, $description);
 		$this->items[]=$itemO;
 		return $itemO;
 	}
 
-	public function addIcon($icon,$before=true,$labeled=false){
+	public function addIcon($icon, $before=true, $labeled=false) {
 		$this->removeArrow();
-		$this->addIconP($icon,$before,$labeled);
+		$this->addIconP($icon, $before, $labeled);
 		return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter("");
 	}
 
-	public function addIcons($icons){
+	public function addIcons($icons) {
 		$count=$this->count();
-		for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){
+		for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) {
 			$this->getItem($i)->addIcon($icons[$i]);
 		}
 	}
@@ -83,33 +83,33 @@ 
 	 * @param int $position
 	 * @return HtmlDropdownItem
 	 */
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->beforeAddItem($item);
-		 $start = array_slice($this->items, 0, $position);
-		 $end = array_slice($this->items, $position);
-		 $start[] = $item;
+		 $start=array_slice($this->items, 0, $position);
+		 $end=array_slice($this->items, $position);
+		 $start[]=$item;
 		 $this->items=array_merge($start, $end);
 		 return $itemO;
 	}
 
-	protected function removeArrow(){
-		if(\sizeof($this->content)>1){
+	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){
+	protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) {
 		$itemO=$item;
-		if(\is_array($item)){
+		if (\is_array($item)) {
 			$description=JArray::getValue($item, "description", 3);
 			$value=JArray::getValue($item, "value", 1);
 			$image=JArray::getValue($item, "image", 2);
 			$item=JArray::getValue($item, "item", 0);
 		}
-		if(!$item instanceof HtmlDropdownItem){
-			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description);
-		}elseif($itemO instanceof HtmlDropdownItem){
+		if (!$item instanceof HtmlDropdownItem) {
+			$itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description);
+		}elseif ($itemO instanceof HtmlDropdownItem) {
 			$this->addToProperty("class", "vertical");
 		}
 		return $itemO;
@@ -122,11 +122,11 @@ 
 		$this->addItem($function($object));
 	}
 
-	public function addInput($name){
-		if(!isset($name))
+	public function addInput($name) {
+		if (!isset($name))
 			$name="input-".$this->identifier;
 		$this->setAction("activate");
-		$this->input=new HtmlInput($name,"hidden");
+		$this->input=new HtmlInput($name, "hidden");
 		$this->input->setIdentifier("input-".$this->identifier);
 		return $this->input;
 	}
@@ -137,15 +137,15 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addSearchInputItem($placeHolder=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon));
+	public function addSearchInputItem($placeHolder=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon));
 	}
 
 	/**
 	 * Adds a divider item
 	 * @return HtmlDropdownItem
 	 */
-	public function addDividerItem(){
+	public function addDividerItem() {
 		return $this->addItem(HtmlDropdownItem::divider());
 	}
 
@@ -155,8 +155,8 @@ 
 	 * @param string $icon
 	 * @return HtmlDropdownItem
 	 */
-	public function addHeaderItem($caption=NULL,$icon=NULL){
-		return $this->addItem(HtmlDropdownItem::header($caption,$icon));
+	public function addHeaderItem($caption=NULL, $icon=NULL) {
+		return $this->addItem(HtmlDropdownItem::header($caption, $icon));
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @param string $color
 	 * @return HtmlDropdownItem
 	 */
-	public function addCircularLabelItem($caption,$color){
+	public function addCircularLabelItem($caption, $color) {
 		return $this->addItem(HtmlDropdownItem::circular($caption, $color));
 	}
 
@@ -174,17 +174,17 @@ 
 	 * @param string $image
 	 * @return \Ajax\semantic\html\content\HtmlDropdownItem
 	 */
-	public function addMiniAvatarImageItem($caption,$image){
+	public function addMiniAvatarImageItem($caption, $image) {
 		return $this->addItem(HtmlDropdownItem::avatar($caption, $image));
 	}
 
-	public function addItems($items){
-		if(\is_array($items) && $this->_associative){
-			foreach ($items as $k=>$v){
+	public function addItems($items) {
+		if (\is_array($items) && $this->_associative) {
+			foreach ($items as $k=>$v) {
 				$this->addItem($v)->setData($k);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
@@ -196,98 +196,98 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
+	public function setPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->items[$i++];
-			if(isset($c)){
-				$c->setProperty($property,$value);
+			if (isset($c)) {
+				$c->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
 		return $this;
 	}
 
-	public function each($callBack){
-		foreach ($this->items as $index=>$value){
-			$callBack($index,$value);
+	public function each($callBack) {
+		foreach ($this->items as $index=>$value) {
+			$callBack($index, $value);
 		}
 		return $this;
 	}
 
-	public function getItem($index){
+	public function getItem($index) {
 		return $this->items[$index];
 	}
 
 	/**
 	 * @return int
 	 */
-	public function count(){
+	public function count() {
 		return \sizeof($this->items);
 	}
 	/**
 	 * @param boolean $dropdown
 	 */
-	public function asDropdown($dropdown){
-		if($dropdown===false){
+	public function asDropdown($dropdown) {
+		if ($dropdown===false) {
 			$this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php';
 			$dropdown="menu";
-		}else{
+		} else {
 			$dropdown="dropdown";
 			$this->mClass="menu";
 		}
-		return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown"));
+		return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown"));
 	}
 
-	public function setVertical(){
-		return $this->addToPropertyCtrl("class", "vertical",array("vertical"));
+	public function setVertical() {
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
 	}
 
-	public function setInline(){
-		return $this->addToPropertyCtrl("class", "inline",["inline"]);
+	public function setInline() {
+		return $this->addToPropertyCtrl("class", "inline", ["inline"]);
 	}
 
-	public function setSimple(){
-		return $this->addToPropertyCtrl("class", "simple",array("simple"));
+	public function setSimple() {
+		return $this->addToPropertyCtrl("class", "simple", array("simple"));
 	}
 
-	public function asButton($floating=false){
+	public function asButton($floating=false) {
 		$this->removeArrow();
-		if($floating)
+		if ($floating)
 			$this->addToProperty("class", "floating");
 		$this->removePropertyValue("class", "selection");
 		return $this->addToProperty("class", "button");
 	}
 
-	public function asSelect($name=NULL,$multiple=false,$selection=true){
+	public function asSelect($name=NULL, $multiple=false, $selection=true) {
 		$this->_multiple=$multiple;
-		if(isset($name))
+		if (isset($name))
 			$this->addInput($name);
-		if($multiple){
+		if ($multiple) {
 			$this->addToProperty("class", "multiple");
 		}
-		if ($selection){
-			if($this->propertyContains("class", "button")===false)
-				$this->addToPropertyCtrl("class", "selection",array("selection"));
+		if ($selection) {
+			if ($this->propertyContains("class", "button")===false)
+				$this->addToPropertyCtrl("class", "selection", array("selection"));
 		}
 		return $this;
 	}
 
-	public function asSearch($name=NULL,$multiple=false,$selection=true){
-		$this->asSelect($name,$multiple,$selection);
+	public function asSearch($name=NULL, $multiple=false, $selection=true) {
+		$this->asSelect($name, $multiple, $selection);
 		return $this->addToProperty("class", "search");
 	}
 
-	public function setSelect($name=NULL,$multiple=false){
-		if(!isset($name))
+	public function setSelect($name=NULL, $multiple=false) {
+		if (!isset($name))
 			$name="select-".$this->identifier;
 		$this->input=null;
-		if($multiple){
+		if ($multiple) {
 			$this->setProperty("multiple", true);
 			$this->addToProperty("class", "multiple");
 		}
@@ -295,37 +295,37 @@ 
 		$this->tagName="select";
 		$this->setProperty("name", $name);
 		$this->content=null;
-		foreach ($this->items as $item){
+		foreach ($this->items as $item) {
 			$item->asOption();
 		}
 		return $this;
 	}
 
-	public function asSubmenu($pointing=NULL){
+	public function asSubmenu($pointing=NULL) {
 		$this->setClass("ui dropdown link item");
-		if(isset($pointing)){
+		if (isset($pointing)) {
 			$this->setPointing($pointing);
 		}
 		return $this;
 	}
 
-	public function setPointing($value=Direction::NONE){
-		return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing"));
+	public function setPointing($value=Direction::NONE) {
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		$this->value=$value;
 		return $this;
 	}
-	private function applyValue(){
+	private function applyValue() {
 		$value=$this->value;
-		if(isset($this->input) && isset($value)){
+		if (isset($this->input) && isset($value)) {
 			$this->input->setProperty("value", $value);
-		}else{
+		} else {
 			$this->setProperty("value", $value);
 		}
 			$textElement=$this->getElementById("text-".$this->identifier, $this->content);
-			if(isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
+			if (isset($textElement) && ($textElement instanceof HtmlDoubleElement) && !$this->_multiple)
 				$textElement->setContent($value);
 		return $this;
 	}
@@ -335,9 +335,9 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if($this->propertyContains("class", "simple")===false){
-			if(isset($this->_bsComponent)===false){
-				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params);
+		if ($this->propertyContains("class", "simple")===false) {
+			if (isset($this->_bsComponent)===false) {
+				$this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params);
 				$this->_bsComponent->setItemSelector(".item");
 			}
 			$this->addEventsOnRun($js);
@@ -345,41 +345,41 @@ 
 		}
 	}
 
-	public function setCompact(){
+	public function setCompact() {
 		return $this->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
-	public function setAction($action){
+	public function setAction($action) {
 		$this->_params["action"]=$action;
 	}
 
-	public function setOn($on){
+	public function setOn($on) {
 		$this->_params["on"]=$on;
 	}
 
-	public function setShowOnFocus($value){
+	public function setShowOnFocus($value) {
 		$this->_params["showOnFocus"]=$value;
 	}
 
-	public function setFullTextSearch($value){
+	public function setFullTextSearch($value) {
 		$this->_params["fullTextSearch"]=$value;
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$this->applyValue();
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	public function getInput() {
 		return $this->input;
 	}
 
-	public function setIcon($icon="dropdown"){
+	public function setIcon($icon="dropdown") {
 		$this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon);
 		return $this;
 	}
 
-	public function jsAddItem($caption){
+	public function jsAddItem($caption) {
 		$js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var new =first.clone();first.parent().append(new);first.html('{$caption}};')";
 		return $js;
 	}

Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php

Spacing +57 added lines, -57 removed lines

@@ -13,21 +13,21 @@ 
  * @property boolean $_visibleHover
  * @property InstanceViewer $_instanceViewer
  */
-trait DataTableFieldAsTrait{
+trait DataTableFieldAsTrait {
 	abstract public function addField($field);
-	abstract public function insertField($index,$field);
-	abstract public function insertInField($index,$field);
-	abstract public function fieldAs($index,$type,$attributes=NULL);
+	abstract public function insertField($index, $field);
+	abstract public function insertInField($index, $field);
+	abstract public function fieldAs($index, $type, $attributes=NULL);
 	abstract protected function cleanIdentifier($id);
-	abstract protected function _fieldAs($elementCallback,&$index,$attributes=NULL,$prefix=null);
+	abstract protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null);
 	/**
 	 * @param string $caption
 	 * @param callable $callback
 	 * @param boolean $visibleHover
 	 * @return callable
 	 */
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
 	}
 
 	/**
@@ -36,20 +36,20 @@ 
 	 * @param callable $callback
 	 * @return callable
 	 */
-	private function getCallable($thisCallback,$parameters,$callback=null){
-		$result=function($instance) use($thisCallback,$parameters,$callback){
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
-			if(isset($callback)){
-				if(\is_callable($callback)){
-					$callback($object,$instance,$this->_instanceViewer->count()+1);
+	private function getCallable($thisCallback, $parameters, $callback=null) {
+		$result=function($instance) use($thisCallback, $parameters, $callback){
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
+			if (isset($callback)) {
+				if (\is_callable($callback)) {
+					$callback($object, $instance, $this->_instanceViewer->count()+1);
 				}
 			}
-			if($object instanceof HtmlSemDoubleElement){
+			if ($object instanceof HtmlSemDoubleElement) {
 				$id=$this->_instanceViewer->getIdentifier();
-				$object->setProperty("data-ajax",$id);
-				if($object->propertyContains("class","visibleover")){
+				$object->setProperty("data-ajax", $id);
+				if ($object->propertyContains("class", "visibleover")) {
 					$this->_visibleHover=true;
-					$object->setProperty("style","visibility:hidden;");
+					$object->setProperty("style", "visibility:hidden;");
 				}
 			}
 			return $object;
@@ -61,16 +61,16 @@ 
 	 * @param string $caption
 	 * @return HtmlButton
 	 */
-	private function getFieldButton($caption,$visibleHover=true){
-		$bt= new HtmlButton($this->cleanIdentifier($caption),$caption);
-		if($visibleHover)
+	private function getFieldButton($caption, $visibleHover=true) {
+		$bt=new HtmlButton($this->cleanIdentifier($caption), $caption);
+		if ($visibleHover)
 			$this->_visibleOver($bt);
 		return $bt;
 	}
 
-	private function getFieldButtons($buttons,$visibleHover=true){
-		$bts=new HtmlButtonGroups("",$buttons);
-		if($visibleHover)
+	private function getFieldButtons($buttons, $visibleHover=true) {
+		$bts=new HtmlButtonGroups("", $buttons);
+		if ($visibleHover)
 			$this->_visibleOver($bts);
 		return $bts;
 	}
@@ -84,19 +84,19 @@ 
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
 	 * @return DataTable
 	 */
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
-			$button=new HtmlButton($id,$value,$cssStyle);
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
+			$button=new HtmlButton($id, $value, $cssStyle);
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
 				$this->_visibleOver($button);
 				return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
-	protected function _visibleOver(BaseHtml $element){
+	protected function _visibleOver(BaseHtml $element) {
 		$this->_visibleHover=true;
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
 	}
 
 	/**
@@ -106,8 +106,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -118,8 +118,8 @@ 
 	 * @param boolean $visibleHover
 	 * @return DataTable
 	 */
-	public function addFieldButtons($buttons,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getFieldButtons",[$buttons,$visibleHover],$callback));
+	public function addFieldButtons($buttons, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getFieldButtons", [$buttons, $visibleHover], $callback));
 		return $this;
 	}
 
@@ -130,8 +130,8 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
@@ -142,25 +142,25 @@ 
 	 * @param callable $callback
 	 * @return DataTable
 	 */
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
 		return $this;
 	}
 
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
 		return $this;
 	}
 
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
-		$bt=$this->getFieldButton("",$visibleHover);
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
+		$bt=$this->getFieldButton("", $visibleHover);
 		$bt->asIcon($icon);
-		if(isset($class))
+		if (isset($class))
 			$bt->addClass($class);
 		return $bt;
 	}
@@ -172,9 +172,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -184,9 +184,9 @@ 
 	 * @param callable $callback this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
 	}
 
 	/**
@@ -197,20 +197,20 @@ 
 	 * @param callable $callbackDelete this function takes the following arguments : $object=>the delete button, $instance : the active instance of the object
 	 * @return DataTable
 	 */
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
 		return $this;
 	}
 
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
 		$this->_deleteBehavior=$deleteBehavior;
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
 	}
 
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
 		$this->_editBehavior=$editBehavior;
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
 	}
 }

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +33 added lines, -33 removed lines

@@ -21,83 +21,83 @@ 
 	use BaseTrait;
 
 	public function __construct($identifier, $modelInstance=NULL) {
-		parent::__construct($identifier, null,$modelInstance);
+		parent::__construct($identifier, null, $modelInstance);
 		$this->_form=new HtmlForm($identifier);
 		$this->_init(new FormInstanceViewer($identifier), "form", $this->_form, true);
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$name}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_modelInstance);
 
 			$form=$this->content["form"];
 			$this->_generateContent($form);
 
-			if(isset($this->_toolbar)){
+			if (isset($this->_toolbar)) {
 				$this->_setToolbarPosition($form);
 			}
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"form",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "form", PositionInTable::AFTERTABLE]);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
 	/**
 	 * @param HtmlForm $form
 	 */
-	protected function _generateContent($form){
-		$values= $this->_instanceViewer->getValues();
+	protected function _generateContent($form) {
+		$values=$this->_instanceViewer->getValues();
 		$count=$this->_instanceViewer->count();
 		$separators=$this->_instanceViewer->getSeparators();
 		$headers=$this->_instanceViewer->getHeaders();
 		$wrappers=$this->_instanceViewer->getWrappers();
 		\sort($separators);
 		$size=\sizeof($separators);
-		if($size===1){
+		if ($size===1) {
 			$i=-1;
-			foreach ($values as $v){
+			foreach ($values as $v) {
 				$this->_generateFields($form, [$v], $headers, $i, $wrappers);
 				$i++;
 			}
-		}else{
+		} else {
 			$separators[]=$count;
-			for($i=0;$i<$size;$i++){
-				$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
+			for ($i=0; $i<$size; $i++) {
+				$fields=\array_slice($values, $separators[$i]+1, $separators[$i+1]-$separators[$i]);
 				$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers);
 			}
 		}
 	}
 
-	protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $wrappers) {
 		$wrapper=null;
-		if(isset($headers[$sepFirst+1]))
-			$form->addHeader($headers[$sepFirst+1],4,true);
-		if(isset($wrappers[$sepFirst+1])){
+		if (isset($headers[$sepFirst+1]))
+			$form->addHeader($headers[$sepFirst+1], 4, true);
+		if (isset($wrappers[$sepFirst+1])) {
 			$wrapper=$wrappers[$sepFirst+1];
 		}
-		if(\sizeof($values)===1){
+		if (\sizeof($values)===1) {
 			$added=$form->addField($values[0]);
-		}elseif(\sizeof($values)>1){
+		}elseif (\sizeof($values)>1) {
 			$added=$form->addFields($values);
-		}else
+		} else
 			return;
-		if(isset($wrapper)){
-			$added->wrap($wrapper[0],$wrapper[1]);
+		if (isset($wrapper)) {
+			$added->wrap($wrapper[0], $wrapper[1]);
 		}
 	}
 
 	/**
 	 * @return HtmlForm
 	 */
-	public function getForm(){
+	public function getForm() {
 		return $this->content["form"];
 	}
 
-	public function addSeparatorAfter($fieldNum){
+	public function addSeparatorAfter($fieldNum) {
 		$fieldNum=$this->_getIndex($fieldNum);
 		$this->_instanceViewer->addSeparatorAfter($fieldNum);
 		return $this;
@@ -112,12 +112,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -136,19 +136,19 @@ 
 		$this->content[$this->_toolbarPosition]=$this->_toolbar;
 	}
 
-	public function addDividerBefore($index,$title){
+	public function addDividerBefore($index, $title) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->addHeaderDividerBefore($index, $title);
 		return $this;
 	}
 
-	public function addWrapper($index,$contentBefore,$contentAfter=null){
+	public function addWrapper($index, $contentBefore, $contentAfter=null) {
 		$index=$this->_getIndex($index);
-		$this->_instanceViewer->addWrapper($index, $contentBefore,$contentAfter);
+		$this->_instanceViewer->addWrapper($index, $contentBefore, $contentAfter);
 		return $this;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		parent::run($js);
 	}
 }

Ajax/semantic/html/content/HtmlMenuItem.php

Spacing +8 added lines, -8 removed lines

@@ -9,25 +9,25 @@
 class HtmlMenuItem extends HtmlSemDoubleElement {
 	use MenuItemTrait;
 	public function __construct($identifier, $content) {
-		parent::__construct($identifier,"div","item",$content);
+		parent::__construct($identifier, "div", "item", $content);
 	}
 
-	protected function initContent($content){
-		if(\is_array($content)){
-			if(JArray::isAssociative($content)===false){
+	protected function initContent($content) {
+		if (\is_array($content)) {
+			if (JArray::isAssociative($content)===false) {
 				$icon=@$content[0];
 				$title=@$content[1];
-			}else{
+			} else {
 				$icon=@$content["icon"];
 				$title=@$content["title"];
 			}
-			if(isset($icon)){
+			if (isset($icon)) {
 				$this->addIcon($icon);
 			}
-			if(isset($title)){
+			if (isset($title)) {
 				$this->setTitle($title);
 			}
-		}else{
+		} else {
 			$this->setContent($content);
 		}
 	}

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

Spacing +44 added lines, -44 removed lines

@@ -20,35 +20,35 @@ 
  * @property string $identifier
  */
 trait FieldsTrait {
-	abstract public function addFields($fields=NULL,$label=NULL);
+	abstract public function addFields($fields=NULL, $label=NULL);
 	abstract public function addItem($item);
 	abstract public function getItem($index);
 	abstract public function count();
 
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
-		}elseif(\is_object($value)){
+		}elseif (\is_object($value)) {
 			$itemO=new HtmlFormField("field-".$this->identifier, $value);
 			return $itemO;
-		}else
+		} else
 			return new HtmlFormInput($value);
 	}
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput;
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
 	/**
@@ -57,35 +57,35 @@ 
 	 * @param array|mixed $values
 	 * @return HtmlFormFields
 	 */
-	public function setFieldsPropertyValues($property,$values){
+	public function setFieldsPropertyValues($property, $values) {
 		$i=0;
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $value){
+		foreach ($values as $value) {
 			$c=$this->content[$i++];
-			if(isset($c)){
+			if (isset($c)) {
 				$df=$c->getDataField();
-				$df->setProperty($property,$value);
+				$df->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
 		return $this;
 	}
 
-	public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){
+	public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) {
 		$field=$this->getItem($index);
-		if(isset($field)){
-			$field->addRule($type,$prompt,$value);
+		if (isset($field)) {
+			$field->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 
-	public function addFieldRules($index,$rules){
+	public function addFieldRules($index, $rules) {
 		$field=$this->getItem($index);
-		if(isset($field)){
+		if (isset($field)) {
 			$field->addRules($rules);
 		}
 		return $this;
@@ -100,8 +100,8 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlFormDropdown
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
 	/**
@@ -111,8 +111,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function addButtonGroups($identifier,$elements=[],$asIcons=false){
-		return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons));
+	public function addButtonGroups($identifier, $elements=[], $asIcons=false) {
+		return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -124,8 +124,8 @@ 
 	 * @param string $icon
 	 * @return HtmlButtonGroups
 	 */
-	public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){
-		return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon));
+	public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) {
+		return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon));
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlFormInput
 	 */
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
 	/**
@@ -148,16 +148,16 @@ 
 	 * @param int $rows
 	 * @return HtmlTextarea
 	 */
-	public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){
-		return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows));
+	public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) {
+		return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows));
 	}
 
-	public function addPassword($identifier, $label=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,"password","",""));
+	public function addPassword($identifier, $label=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", ""));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
 	/**
@@ -167,16 +167,16 @@ 
 	 * @param string $type
 	 * @return HtmlFormCheckbox
 	 */
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 
-	public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){
-		$div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content);
-		return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label));
+	public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") {
+		$div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content);
+		return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label));
 	}
 }

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +107 added lines, -107 removed lines

@@ -24,7 +24,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 	protected $_searchField;
 	protected $_urls;
 	protected $_pagination;
@@ -42,35 +42,35 @@ 
 	protected $_colWidths;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
-		parent::__construct($identifier, $model,$modelInstance);
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
+	public function __construct($identifier, $model, $modelInstance=NULL) {
+		parent::__construct($identifier, $model, $modelInstance);
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
 		$this->_urls=[];
-		$this->_emptyMessage=new HtmlMessage("","nothing to display");
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
-	public function run(JsUtils $js){
-		if($this->_hasCheckboxes && isset($js)){
+	public function run(JsUtils $js) {
+		if ($this->_hasCheckboxes && isset($js)) {
 			$this->_runCheckboxes($js);
 		}
-		if($this->_visibleHover){
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
+		if ($this->_visibleHover) {
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
 		}
-		if(\is_array($this->_deleteBehavior))
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
-		if(\is_array($this->_editBehavior))
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
+		if (\is_array($this->_deleteBehavior))
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
+		if (\is_array($this->_editBehavior))
+			$this->_generateBehavior("edit", $this->_editBehavior, $js);
 		parent::run($js);
 	}
 
 
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector($op),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -83,164 +83,164 @@ 
 	}
 
 
-	public function compile(JsUtils $js=NULL,&$view=NULL){
-		if(!$this->_generated){
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			$this->_instanceViewer->setInstance($this->_model);
 			$captions=$this->_instanceViewer->getCaptions();
 			$table=$this->content["table"];
-			if($this->_hasCheckboxes){
+			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
 			$table->setRowCount(0, \sizeof($captions));
-			$this->_generateHeader($table,$captions);
+			$this->_generateHeader($table, $captions);
 
-			if(isset($this->_compileParts))
+			if (isset($this->_compileParts))
 				$table->setCompileParts($this->_compileParts);
 
 			$this->_generateContent($table);
 
-			$this->compileExtraElements($table, $captions,$js);
+			$this->compileExtraElements($table, $captions, $js);
 
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
 			$this->_generated=true;
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	protected function compileExtraElements($table,$captions,JsUtils $js=NULL){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
-				$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+	protected function compileExtraElements($table, $captions, JsUtils $js=NULL) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
+				$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 		}
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
 			$table->getHeader()->getCell(0, 0)->addClass("no-sort");
 		}
 
-		if(isset($this->_toolbar)){
+		if (isset($this->_toolbar)) {
 			$this->_setToolbarPosition($table, $captions);
 		}
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
-			$this->_generatePagination($table,$js);
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
+			$this->_generatePagination($table, $js);
 		}
 	}
 
-	protected function _applyStyleAttributes($table){
-		if(isset($this->_hiddenColumns))
+	protected function _applyStyleAttributes($table) {
+		if (isset($this->_hiddenColumns))
 			$this->_hideColumns();
-			if(isset($this->_colWidths)){
-				foreach ($this->_colWidths as $colIndex=>$width){
-					$table->setColWidth($colIndex,$width);
+			if (isset($this->_colWidths)) {
+				foreach ($this->_colWidths as $colIndex=>$width) {
+					$table->setColWidth($colIndex, $width);
 				}
 			}
 	}
 
-	protected function _hideColumns(){
-		foreach ($this->_hiddenColumns as $colIndex){
+	protected function _hideColumns() {
+		foreach ($this->_hiddenColumns as $colIndex) {
 			$this->_self->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	protected function _generateHeader(HtmlTable $table,$captions){
+	protected function _generateHeader(HtmlTable $table, $captions) {
 		$table->setHeaderValues($captions);
-		if(isset($this->_sortable)){
+		if (isset($this->_sortable)) {
 			$table->setSortable($this->_sortable);
 		}
 	}
 
 
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$objects=$this->_modelInstance;
-		if(isset($this->_pagination)){
+		if (isset($this->_pagination)) {
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 			InstanceViewer::setIndex(0);
 			$table->fromDatabaseObjects($objects, function($instance) use($table){
 				return $this->_generateRow($instance, $table);
 			});
-		if($table->getRowCount()==0){
+		if ($table->getRowCount()==0) {
 			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([$this->_emptyMessage]);
 		}
 	}
 
-	protected function _generateRow($instance,&$table,$checkedClass=null){
+	protected function _generateRow($instance, &$table, $checkedClass=null) {
 		$this->_instanceViewer->setInstance($instance);
 		InstanceViewer::$index++;
-		$values= $this->_instanceViewer->getValues();
+		$values=$this->_instanceViewer->getValues();
 		$id=$this->_instanceViewer->getIdentifier();
 		$dataAjax=$id;
 		$id=$this->cleanIdentifier($id);
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$checked=false;
-			if(isset($this->_checkedCallback)){
+			if (isset($this->_checkedCallback)) {
 				$func=$this->_checkedCallback;
 				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$dataAjax);
+			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if(isset($checkedClass))
+			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
 		$result=$table->newRow();
 		$result->setIdentifier($this->identifier."-tr-".$id);
-		$result->setProperty("data-ajax",$dataAjax);
+		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
-		$result->addToProperty("class",$this->_rowClass);
+		$result->addToProperty("class", $this->_rowClass);
 		return $result;
 	}
 
-	protected function _generatePagination($table,$js=NULL){
-		if(isset($this->_toolbar)){
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
+	protected function _generatePagination($table, $js=NULL) {
+		if (isset($this->_toolbar)) {
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
 		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
 		$menu->floatRight();
 		$menu->setActiveItem($this->_pagination->getPage()-1);
 		$footer->addValues($menu);
-		$this->_associatePaginationBehavior($menu,$js);
+		$this->_associatePaginationBehavior($menu, $js);
 	}
 
-	protected function _associatePaginationBehavior(HtmlMenu $menu,JsUtils $js=NULL){
-		if(isset($this->_urls["refresh"])){
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}",$this->getRefreshSelector(),["preventDefault"=>false,"jqueryDone"=>"replaceWith","hasLoader"=>false]);
+	protected function _associatePaginationBehavior(HtmlMenu $menu, JsUtils $js=NULL) {
+		if (isset($this->_urls["refresh"])) {
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", $this->getRefreshSelector(), ["preventDefault"=>false, "jqueryDone"=>"replaceWith", "hasLoader"=>false]);
 		}
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		$fieldName=parent::_getFieldName($index);
-		if(\is_object($fieldName))
+		if (\is_object($fieldName))
 			$fieldName="field-".$index;
 		return $fieldName."[]";
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function _setToolbarPosition($table,$captions=NULL){
-		switch ($this->_toolbarPosition){
+	protected function _setToolbarPosition($table, $captions=NULL) {
+		switch ($this->_toolbarPosition) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if(isset($this->_compileParts)===false){
+				if (isset($this->_compileParts)===false) {
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
 			case PositionInTable::FOOTER:
 			case PositionInTable::BODY:
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
 				break;
 		}
 	}
@@ -252,16 +252,16 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return DataTable
 	 */
-	public function afterCompile($index,$callback){
-		$this->_instanceViewer->afterCompile($index,$callback);
+	public function afterCompile($index, $callback) {
+		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	private function addToolbarRow($part,$table,$captions){
+	private function addToolbarRow($part, $table, $captions) {
 		$hasPart=$table->hasPart($part);
-		if($hasPart){
+		if ($hasPart) {
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
-		}else{
+		} else {
 			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
@@ -273,7 +273,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -288,12 +288,12 @@ 
 	 * @return DataTable
 	 */
 	public function setUrls($urls) {
-		if(\is_array($urls)){
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
-		}else{
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
+		if (\is_array($urls)) {
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+		} else {
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
 		}
 		return $this;
 	}
@@ -306,8 +306,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function paginate($page,$total_rowcount,$items_per_page=10,$pages_visibles=null){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page,$total_rowcount);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page, $total_rowcount);
 		return $this;
 	}
 
@@ -318,8 +318,8 @@ 
 	 * @param number $pages_visibles The number of visible pages in the Pagination component
 	 * @return DataTable
 	 */
-	public function autoPaginate($page=1,$items_per_page=10,$pages_visibles=4){
-		$this->_pagination=new Pagination($items_per_page,$pages_visibles,$page);
+	public function autoPaginate($page=1, $items_per_page=10, $pages_visibles=4) {
+		$this->_pagination=new Pagination($items_per_page, $pages_visibles, $page);
 		return $this;
 	}
 
@@ -329,7 +329,7 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
@@ -340,14 +340,14 @@ 
 	 * @param string $position
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addSearchInToolbar($position=Direction::RIGHT){
+	public function addSearchInToolbar($position=Direction::RIGHT) {
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
 	}
 
-	public function getSearchField(){
-		if(isset($this->_searchField)===false){
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
-			$this->_searchField->addIcon("search",Direction::RIGHT);
+	public function getSearchField() {
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
+			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
 	}
@@ -367,7 +367,7 @@ 
 	 * Returns a form corresponding to the Datatable
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -375,7 +375,7 @@ 
 
 	protected function getTargetSelector($op) {
 		$result=$this->_targetSelector;
-		if(!isset($result[$op]))
+		if (!isset($result[$op]))
 			$result="#".$this->identifier;
 		return $result[$op];
 	}
@@ -386,15 +386,15 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if(!\is_array($_targetSelector)){
-			$_targetSelector=["edit"=>$_targetSelector,"delete"=>$_targetSelector];
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=["edit"=>$_targetSelector, "delete"=>$_targetSelector];
 		}
 		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -412,9 +412,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -449,29 +449,29 @@ 
 		return $this;
 	}
 
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_self->setActiveRowSelector($class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if(!\is_array($this->_hiddenColumns))
+	public function hideColumn($colIndex) {
+		if (!\is_array($this->_hiddenColumns))
 			$this->_hiddenColumns=[];
 		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		$this->content["table"]->setColAlignment($colIndex,$alignment);
+	public function setColAlignment($colIndex, $alignment) {
+		$this->content["table"]->setColAlignment($colIndex, $alignment);
 		return $this;
 	}
 }