phpMv / phpMv-UI

Ajax/semantic/html/collections/table/traits/TableTrait.php

Spacing +22 added lines, -22 removed lines

@@ -10,9 +10,9 @@ 
  */
 trait TableTrait {
 
-	abstract public function addEvent($event, $jsCode, $stopPropagation = false, $preventDefault = false);
+	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 
-	abstract public function getOn($event, $url, $responseElement = "", $parameters = array());
+	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 
 	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
@@ -22,8 +22,8 @@ 
 		return $this->addToPropertyTable("class", "celled");
 	}
 
-	public function setBasic($very = false) {
-		$table = $this->_self;
+	public function setBasic($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -33,8 +33,8 @@ 
 		));
 	}
 
-	public function setCompact($very = false) {
-		$table = $this->_self;
+	public function setCompact($very=false) {
+		$table=$this->_self;
 		if ($very)
 			$table->addToPropertyCtrl("class", "very", array(
 				"very"
@@ -56,8 +56,8 @@ 
 		return $this->addToPropertyTable("class", "structured");
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$table = $this->_self;
+	public function setSortable($colIndex=NULL) {
+		$table=$this->_self;
 		if (isset($colIndex) && $table->hasPart("thead")) {
 			$table->getHeader()->sort($colIndex);
 		}
@@ -80,29 +80,29 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation = false, $preventDefault = false) {
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
 		return $this->onRow("click", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event, $jsCode, $stopPropagation = false, $preventDefault = false) {
-		return $this->_self->addEvent($event . "{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		return $this->_self->addEvent($event."{{tbody tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement = "", $parameters = array()) {
-		$jsCondition = '!$(this).closest("tr").is(":focus")';
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$jsCondition='!$(this).closest("tr").is(":focus")';
 		if (isset($parameters['jsCondition'])) {
-			$jsCondition = '(' . $parameters['jsCondition'] . ' && ' . $jsCondition . ')';
+			$jsCondition='('.$parameters['jsCondition'].' && '.$jsCondition.')';
 		}
-		$parameters = \array_merge($parameters, [
+		$parameters=\array_merge($parameters, [
 			"stopPropagation" => false,
 			"preventDefault" => false,
 			"jsCondition" => $jsCondition
 		]);
-		$selector = "tbody tr";
+		$selector="tbody tr";
 		if (isset($parameters["selector"])) {
-			$selector = $parameters["selector"];
+			$selector=$parameters["selector"];
 		}
-		return $this->_self->getOn($event . "{{" . $selector . "}}", $url, $responseElement, $parameters);
+		return $this->_self->getOn($event."{{".$selector."}}", $url, $responseElement, $parameters);
 	}
 
 	public function onPageChange($jsCode) {
@@ -119,10 +119,10 @@ 
 		return $this->_self->getBsComponent()->getScript();
 	}
 
-	public function addEventsOnRun(JsUtils $js = NULL) {
-		$script = parent::addEventsOnRun($js);
-		$innerScript = $this->_self->getInnerScript();
-		if (! isset($innerScript)) {
+	public function addEventsOnRun(JsUtils $js=NULL) {
+		$script=parent::addEventsOnRun($js);
+		$innerScript=$this->_self->getInnerScript();
+		if (!isset($innerScript)) {
 			$this->_self->setInnerScript($script);
 		}
 		return $script;

Ajax/semantic/html/collections/table/HtmlTable.php

Spacing +50 added lines, -50 removed lines

@@ -40,10 +40,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -53,17 +53,17 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
 		return $this->content[$key];
 	}
 
-	protected function _getFirstPart(){
-		if(isset($this->content["thead"])){
+	protected function _getFirstPart() {
+		if (isset($this->content["thead"])) {
 			return $this->content["thead"];
 		}
 		return $this->content["tbody"];
@@ -108,7 +108,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -268,8 +268,8 @@ 
 		return $this->colAlign($colIndex, "colLeftFromRight");
 	}
 
-	public function setColAlignment($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignment($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeft";
 				break;
@@ -289,8 +289,8 @@ 
 		return $this;
 	}
 	
-	public function setColAlignmentFromRight($colIndex,$alignment){
-		switch ($alignment){
+	public function setColAlignmentFromRight($colIndex, $alignment) {
+		switch ($alignment) {
 			case TextAlignment::LEFT:
 				$function="colLeftFromRight";
 				break;
@@ -312,7 +312,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -373,7 +373,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh($js);
 		}
@@ -382,9 +382,9 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		parent::compile_once($js,$view);
+		parent::compile_once($js, $view);
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
 	}
 
@@ -397,13 +397,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -418,26 +418,26 @@ 
 		return $this;
 	}
 	
-	public function refreshTR(){
+	public function refreshTR() {
 		$this->setCompileParts();
 		$this->getPart("tbody")->refreshTR();
 	}
 
-	public function refresh($js){
+	public function refresh($js) {
 		$this->_footer=$this->getFooter();
-		if(isset($js)){
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
+		if (isset($js)) {
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
 		}
 	}
 
-	public function run(JsUtils $js){
-		if(!$this->_runned){
-			if(isset($this->_activeRowSelector)){
+	public function run(JsUtils $js) {
+		if (!$this->_runned) {
+			if (isset($this->_activeRowSelector)) {
 				$this->_activeRowSelector->run();
 			}
 		}
-		$result= parent::run($js);
-		if(isset($this->_footer))
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		$this->_runned=true;
 		return $result;
@@ -461,51 +461,51 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 	
-	public function hasActiveRowSelector(){
+	public function hasActiveRowSelector() {
 		return isset($this->_activeRowSelector);
 	}
 
-	public function hideColumn($colIndex){
-		if(isset($this->content["thead"])){
+	public function hideColumn($colIndex) {
+		if (isset($this->content["thead"])) {
 			$this->content["thead"]->hideColumn($colIndex);
 		}
 		$this->content["tbody"]->hideColumn($colIndex);
-		if(isset($this->content["tfoot"])){
+		if (isset($this->content["tfoot"])) {
 			$this->content["tfoot"]->hideColumn($colIndex);
 		}
 		return $this;
 	}
 
-	public function setColWidth($colIndex,$width){
+	public function setColWidth($colIndex, $width) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0)
+		if ($part!==null && $part->count()>0)
 			$part->getCell(0, $colIndex)->setWidth($width);
 		return $this;
 	}
 
-	public function setColWidths($widths){
+	public function setColWidths($widths) {
 		$part=$this->_getFirstPart();
-		if($part!==null && $part->count()>0){
+		if ($part!==null && $part->count()>0) {
 			$count=$part->getColCount();
-			if(!\is_array($widths)){
+			if (!\is_array($widths)) {
 				$widths=\array_fill(0, $count, $widths);
 			}
-			$max=\min(\sizeof($widths),$count);
-			for($i=0;$i<$max;$i++){
+			$max=\min(\sizeof($widths), $count);
+			for ($i=0; $i<$max; $i++) {
 				$part->getCell(0, $i)->setWidth($widths[$i]);
 			}
 		}
 		return $this;
 	}
 
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
 		$body=$this->getBody();
-		$body->mergeIdentiqualValues($colIndex,$function);
+		$body->mergeIdentiqualValues($colIndex, $function);
 		return $this;
 	}
 	/**
@@ -519,16 +519,16 @@ 
 	 * @param mixed $_innerScript
 	 */
 	public function setInnerScript($_innerScript) {
-		$this->_innerScript = $_innerScript;
+		$this->_innerScript=$_innerScript;
 	}
 	
-	public function onActiveRowChange($jsCode){
-		$this->on("activeRowChange",$jsCode);
+	public function onActiveRowChange($jsCode) {
+		$this->on("activeRowChange", $jsCode);
 		return $this;
 	}
 	
-	public function addMergeRow($colCount,$value=null){
-		return $this->getBody()->addMergeRow($colCount,$value);
+	public function addMergeRow($colCount, $value=null) {
+		return $this->getBody()->addMergeRow($colCount, $value);
 	}
 
 	/**

Ajax/semantic/html/elements/HtmlRail.php

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
  */
 class HtmlRail extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $content = NULL) {
+	public function __construct($identifier, $content=NULL) {
 		parent::__construct($identifier, 'div', 'ui rail', $content);
 	}
 

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param string $onClick
 	 * @return HtmlButton
 	 */
-	public function htmlButton($identifier, $value = null, $cssStyle = null, $onClick = null) {
+	public function htmlButton($identifier, $value=null, $cssStyle=null, $onClick=null) {
 		return $this->addHtmlComponent(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
@@ -59,7 +59,7 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier, $elements = array(), $asIcons = false) {
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
 		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
@@ -72,7 +72,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier, $content = "") {
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -85,7 +85,7 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier, $content = "", $tagName = "div") {
+	public function htmlDivider($identifier, $content="", $tagName="div") {
 		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
@@ -100,7 +100,7 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier, $niveau = 1, $content = NULL, $type = "page") {
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
 		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
@@ -128,7 +128,7 @@ 
 	 * @param string $size
 	 * @return HtmlImage
 	 */
-	public function htmlImage($identifier, $src = "", $alt = "", $size = NULL) {
+	public function htmlImage($identifier, $src="", $alt="", $size=NULL) {
 		return $this->addHtmlComponent(new HtmlImage($identifier, $src, $alt, $size));
 	}
 
@@ -142,7 +142,7 @@ 
 	 * @param string $size
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier, $icons = array(), $size = "") {
+	public function htmlIconGroups($identifier, $icons=array(), $size="") {
 		return $this->addHtmlComponent(new HtmlIconGroups($identifier, $icons, $size));
 	}
 
@@ -157,7 +157,7 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier, $type = "text", $value = "", $placeholder = "") {
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
 		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
@@ -171,7 +171,7 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier, $content = "", $icon = NULL, $tagName = "div") {
+	public function htmlLabel($identifier, $content="", $icon=NULL, $tagName="div") {
 		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $icon, $tagName));
 	}
 
@@ -182,7 +182,7 @@ 
 	 * @param array $attributes
 	 * @return HtmlLabelGroups
 	 */
-	public function htmlLabelGroups($identifier, $labels = array(), $attributes = array()) {
+	public function htmlLabelGroups($identifier, $labels=array(), $attributes=array()) {
 		return $this->addHtmlComponent(new HtmlLabelGroups($identifier, $labels, $attributes));
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier, $items = array()) {
+	public function htmlList($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
@@ -204,7 +204,7 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content = "") {
+	public function htmlSegment($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
@@ -216,7 +216,7 @@ 
 	 *        	the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items = array()) {
+	public function htmlSegmentGroups($identifier, $items=array()) {
 		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 
@@ -230,7 +230,7 @@ 
 	 * @param Direction|string $attributeType
 	 * @return HtmlReveal
 	 */
-	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type = RevealType::FADE, $attributeType = NULL) {
+	public function htmlReveal($identifier, $visibleContent, $hiddenContent, $type=RevealType::FADE, $attributeType=NULL) {
 		return $this->addHtmlComponent(new HtmlReveal($identifier, $visibleContent, $hiddenContent, $type, $attributeType));
 	}
 
@@ -241,7 +241,7 @@ 
 	 * @param array $steps
 	 * @return HtmlStep
 	 */
-	public function htmlStep($identifier, $steps = array()) {
+	public function htmlStep($identifier, $steps=array()) {
 		return $this->addHtmlComponent(new HtmlStep($identifier, $steps));
 	}
 
@@ -275,7 +275,7 @@ 
 	 * @param mixed $content
 	 * @return HtmlRail
 	 */
-	public function htmlRail($identifier, $content = null) {
+	public function htmlRail($identifier, $content=null) {
 		return $this->addHtmlComponent(new HtmlRail($identifier, $content));
 	}
 }

Ajax/common/html/HtmlDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -13,19 +13,19 @@ 
 	 */
 	protected $content;
 
-	protected $wrapContentBefore = "";
+	protected $wrapContentBefore="";
 
-	protected $wrapContentAfter = "";
+	protected $wrapContentAfter="";
 
 	protected $_editableContent;
 
-	public function __construct($identifier, $tagName = "p") {
+	public function __construct($identifier, $tagName="p") {
 		parent::__construct($identifier, $tagName);
-		$this->_template = '<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
+		$this->_template='<%tagName% id="%identifier%" %properties%>%wrapContentBefore%%content%%wrapContentAfter%</%tagName%>';
 	}
 
 	public function setContent($content) {
-		$this->content = $content;
+		$this->content=$content;
 		return $this;
 	}
 
@@ -33,19 +33,19 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content, $before = false) {
-		if (! \is_array($this->content)) {
+	public function addContent($content, $before=false) {
+		if (!\is_array($this->content)) {
 			if (isset($this->content))
-				$this->content = array(
+				$this->content=array(
 					$this->content
 				);
 			else
-				$this->content = array();
+				$this->content=array();
 		}
 		if ($before)
 			\array_unshift($this->content, $content);
 		else
-			$this->content[] = $content;
+			$this->content[]=$content;
 		return $this;
 	}
 
@@ -68,9 +68,9 @@ 
 
 	public function setValue($value) {}
 
-	public function wrapContent($before, $after = "") {
-		$this->wrapContentBefore .= $before;
-		$this->wrapContentAfter = $after . $this->wrapContentAfter;
+	public function wrapContent($before, $after="") {
+		$this->wrapContentBefore.=$before;
+		$this->wrapContentAfter=$after.$this->wrapContentAfter;
 		return $this;
 	}
 
@@ -89,14 +89,14 @@ 
 	}
 
 	protected function _getContentInstances($class, $content) {
-		$instances = [];
+		$instances=[];
 		if ($content instanceof $class) {
-			$instances[] = $content;
+			$instances[]=$content;
 		} elseif ($content instanceof HtmlDoubleElement) {
-			$instances = \array_merge($instances, $content->getContentInstances($class));
+			$instances=\array_merge($instances, $content->getContentInstances($class));
 		} elseif (\is_array($content)) {
 			foreach ($content as $element) {
-				$instances = \array_merge($instances, $this->_getContentInstances($class, $element));
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -107,7 +107,7 @@ 
 	 *
 	 * @return HtmlDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -122,28 +122,28 @@ 
 		return \strip_tags($this->content);
 	}
 
-	public function asEditable(HtmlFormField $field, $asForm = false, $setValueProperty = "val()") {
-		$idF = $field->getIdentifier();
-		$idE = $idF;
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
+		$idF=$field->getIdentifier();
+		$idE=$idF;
 		if ($asForm) {
-			$frm = new HtmlForm("frm-" . $field->getIdentifier());
+			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
-			$fields = $frm->addFields();
-			$idE = $frm->getIdentifier();
+			$fields=$frm->addFields();
+			$idE=$frm->getIdentifier();
 			$fields->addItem($field);
-			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});");
-			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#" . $idE . "').trigger('endEdit');");
-			$this->_editableContent = $frm;
-			$keypress = "";
-			$focusOut = "";
+			$fields->addButtonIcon("bt-okay", "check", "green mini", "\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});");
+			$fields->addButtonIcon("bt-cancel", "close", "mini", "\$('#".$idE."').trigger('endEdit');");
+			$this->_editableContent=$frm;
+			$keypress="";
+			$focusOut="";
 		} else {
-			$focusOut = "if(e.relatedTarget==null)elm.trigger('endEdit');";
-			$this->_editableContent = $field;
-			$keypress = "$('#" . $idF . "').keyup(function(e){if(e.which == 13) {\$('#" . $idE . "').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#" . $idE . "').trigger('endEdit');}});";
+			$focusOut="if(e.relatedTarget==null)elm.trigger('endEdit');";
+			$this->_editableContent=$field;
+			$keypress="$('#".$idF."').keyup(function(e){if(e.which == 13) {\$('#".$idE."').trigger('validate',{value: $('#'+idF+' input').val()});}if(e.keyCode===27) {\$('#".$idE."').trigger('endEdit');}});";
 		}
 		$this->_editableContent->setProperty("style", "display:none;");
-		$this->onCreate("let idF='" . $idF . "';let idE='" . $idE . "';let elm=$('#'+idE);let self=$('#" . $this->getIdentifier() . "');" . $keypress . "elm.on('validate',function(){self.html($('#'+idE+' input')." . $setValueProperty . ");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){" . $focusOut . "});");
-		$this->onClick("let self=$(this);self.hide();" . $field->setJsContent("self.html()") . ";$('#" . $idF . " input').trigger('change');elm.show();$('#'+idE+' input').focus();");
+		$this->onCreate("let idF='".$idF."';let idE='".$idE."';let elm=$('#'+idE);let self=$('#".$this->getIdentifier()."');".$keypress."elm.on('validate',function(){self.html($('#'+idE+' input').".$setValueProperty.");elm.trigger('endEdit');});elm.on('endEdit',function(){self.show();$(this).hide();});elm.focusout(function(e){".$focusOut."});");
+		$this->onClick("let self=$(this);self.hide();".$field->setJsContent("self.html()").";$('#".$idF." input').trigger('change');elm.show();$('#'+idE+' input').focus();");
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 * {@inheritdoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_compiled && isset($this->_editableContent)) {
+	protected function compile_once(\Ajax\JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_compiled && isset($this->_editableContent)) {
 			$this->wrap("", $this->_editableContent);
 		}
 		parent::compile_once($js, $view);

Ajax/common/html/HtmlCollection.php

Spacing +55 added lines, -55 removed lines

@@ -14,44 +14,44 @@ 
  */
 abstract class HtmlCollection extends HtmlDoubleElement {
 
-	public function __construct($identifier,$tagName="div"){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName="div") {
+		parent::__construct($identifier, $tagName);
 		$this->content=array();
 	}
 
-	public function addItems($items){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $k=>$v){
-				$this->addItem([$k,$v]);
+	public function addItems($items) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $k=>$v) {
+				$this->addItem([$k, $v]);
 			}
-		}else{
-			foreach ($items as $item){
+		} else {
+			foreach ($items as $item) {
 				$this->addItem($item);
 			}
 		}
 		return $this;
 	}
 
-	public function setItems($items){
+	public function setItems($items) {
 		$this->content=$items;
 		return $this;
 	}
 
-	public function getItems(){
+	public function getItems() {
 		return $this->content;
 	}
 
-	protected function getItemToAdd($item){
+	protected function getItemToAdd($item) {
 		$itemO=$item;
-		if($this->createCondition($item)===true){
+		if ($this->createCondition($item)===true) {
 			$itemO=$this->createItem($item);
 		}
 		return $itemO;
 	}
 
-	protected function setItemIdentifier($item,$classname,$index){
-		if($item instanceof BaseWidget){
-			if(JString::isNull($item->getIdentifier())){
+	protected function setItemIdentifier($item, $classname, $index) {
+		if ($item instanceof BaseWidget) {
+			if (JString::isNull($item->getIdentifier())) {
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
 			}
 		}
@@ -62,15 +62,15 @@ 
 	 * @param HtmlDoubleElement|string|array $item
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItem($item){
+	public function addItem($item) {
 		$itemO=$this->getItemToAdd($item);
 		$this->addContent($itemO);
 		return $itemO;
 	}
 
-	public function insertItem($item,$position=0){
+	public function insertItem($item, $position=0) {
 		$itemO=$this->getItemToAdd($item);
-		\array_splice( $this->content, $position, 0, array($itemO));
+		\array_splice($this->content, $position, 0, array($itemO));
 		return $itemO;
 	}
 
@@ -80,7 +80,7 @@ 
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
 	public function getItem($index) {
-		if (is_int($index)&& isset($this->content[$index]))
+		if (is_int($index) && isset($this->content[$index]))
 			return $this->content[$index];
 		else {
 			$elm=$this->getElementById($index, $this->content);
@@ -93,11 +93,11 @@ 
 		return $this;
 	}
 
-	public function removeItem($index){
+	public function removeItem($index) {
 		return array_splice($this->content, $index, 1);
 	}
 
-	public function count(){
+	public function count() {
 		return \sizeof($this->content);
 	}
 
@@ -108,8 +108,8 @@ 
 		return $this->addItem($function($object));
 	}
 
-	public function apply($callBack){
-		foreach ($this->content as $item){
+	public function apply($callBack) {
+		foreach ($this->content as $item) {
 			$callBack($item);
 		}
 		return $this;
@@ -129,23 +129,23 @@ 
 	 */
 	abstract protected function createItem($value);
 
-	protected function createCondition($value){
+	protected function createCondition($value) {
 		return !($value instanceof BaseHtml);
 	}
 
-	protected function contentAs($tagName){
-		foreach ($this->content as $item){
+	protected function contentAs($tagName) {
+		foreach ($this->content as $item) {
 			$item->setTagName($tagName);
 		}
 		return $this;
 	}
 
-	public function setProperties($properties){
+	public function setProperties($properties) {
 		$i=0;
-		foreach ($properties as $k=>$v){
+		foreach ($properties as $k=>$v) {
 			$c=$this->content[$i++];
-			if(isset($c))
-				$c->setProperty($k,$v);
+			if (isset($c))
+				$c->setProperty($k, $v);
 			else
 				return $this;
 		}
@@ -158,15 +158,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function setPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function setPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i]->setProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i]->setProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -179,15 +179,15 @@ 
 	 * @param array|mixed $values
 	 * @return $this
 	 */
-	public function addPropertyValues($property,$values){
-		if(\is_array($values)===false){
-			$values=\array_fill(0, $this->count(),$values);
+	public function addPropertyValues($property, $values) {
+		if (\is_array($values)===false) {
+			$values=\array_fill(0, $this->count(), $values);
 		}
-		foreach ($values as $i=>$value){
-			if(isset($this->content[$i])){
-				$this->content[$i++]->addToProperty($property,$value);
+		foreach ($values as $i=>$value) {
+			if (isset($this->content[$i])) {
+				$this->content[$i++]->addToProperty($property, $value);
 			}
-			else{
+			else {
 				return $this;
 			}
 		}
@@ -197,13 +197,13 @@ 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		$index=0;
 		$classname=\strtolower(JReflection::shortClassName($this));
-		foreach ($this->content as $item){
-			$this->setItemIdentifier($item,$classname,$index++);
+		foreach ($this->content as $item) {
+			$this->setItemIdentifier($item, $classname, $index++);
 		}
-		return parent::compile($js,$view);
+		return parent::compile($js, $view);
 	}
 
-	public function getItemById($identifier){
+	public function getItemById($identifier) {
 		return $this->getElementById($identifier, $this->content);
 	}
 
@@ -212,13 +212,13 @@ 
 	 * @param string $target
 	 * @return HtmlCollection
 	 */
-	public function asLinks($hrefs=[],$target=NUll) {
-		foreach ( $this->content as $index=>$item ) {
-			if($item instanceof HtmlDoubleElement){
+	public function asLinks($hrefs=[], $target=NUll) {
+		foreach ($this->content as $index=>$item) {
+			if ($item instanceof HtmlDoubleElement) {
 				$href="";
-				if(isset($hrefs[$index]))
+				if (isset($hrefs[$index]))
 					$href=$hrefs[$index];
-				$item->asLink($href,$target);
+				$item->asLink($href, $target);
 			}
 		}
 		return $this;
@@ -230,8 +230,8 @@ 
 	 * @param int $length  If length is omitted, removes everything from offset to the end of the array. If length is specified and is positive, then that many elements will be removed. If length is specified and is negative then the end of the removed portion will be that many elements from the end of the array. If length is specified and is zero, no elements will be removed. Tip: to remove everything from offset to the end of the array when replacement is also specified, use count($input) for length. 
 	 * @return $this
 	 */
-	public function splice($offset,$length=null){
-		$this->content=array_slice($this->content, $offset,$length);
+	public function splice($offset, $length=null) {
+		$this->content=array_slice($this->content, $offset, $length);
 		return $this;
 	}
 }

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

Spacing +46 added lines, -46 removed lines

@@ -15,7 +15,7 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
@@ -23,23 +23,23 @@ 
 	abstract protected function getForm();
 	
 
-	protected function addCompoValidation(Form $compo,HtmlFormField $field){
+	protected function addCompoValidation(Form $compo, HtmlFormField $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 	}
 	
-	protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
+	protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) {
 		$compo->addFieldValidation($validation);
 	}
 
-	protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"])){
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
+		if (isset($params["_ajaxSubmit"])) {
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -48,16 +48,16 @@ 
 		$form->addEventsOnRun($js);
 	}
 
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
 		$compilation="";
-		if(\is_array($ajaxSubmit)){
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
+		if (\is_array($ajaxSubmit)) {
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
 			$compilation=$ajaxSubmit->compile($js);
 		}
-		$compilation=str_ireplace("\"","%quote%", $compilation);
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
 		return $compilation;
 	}
 
@@ -70,14 +70,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -93,48 +93,48 @@ 
 	 * @param array $parameters
 	 * @return HtmlForm
 	 */
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
+		if ($identifierOrElement  instanceof BaseHtml)
 			$elem=$identifierOrElement;
 		else
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
 	}
 
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$this->setSubmitParams($url,$responseElement,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$this->setSubmitParams($url, $responseElement, $parameters);
 		}
 		return $button;
 	}
 
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters)){
-			$params=\array_merge($params,$parameters);
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+		if (\is_array($parameters)) {
+			$params=\array_merge($params, $parameters);
 		}
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -144,7 +144,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -155,35 +155,35 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 	
-	public function addExtraFieldRules($fieldname,$rules){
+	public function addExtraFieldRules($fieldname, $rules) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		foreach ($rules as $rule){
+		foreach ($rules as $rule) {
 			$fv->addRule($rule);
 		}
 	}
 	
-	public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){
+	public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
-		$fv->addRule($type,$prompt,$value);
+		$fv->addRule($type, $prompt, $value);
 	}
 	
-	public function setOptional($fieldname,$optional=true){
+	public function setOptional($fieldname, $optional=true) {
 		$form=$this->getForm();
 		$fv=$form->getExtraFieldValidation($fieldname);
 		$fv->setOptional($optional);
 	}
 
-	public function setActionTarget(string $action, string $target){
+	public function setActionTarget(string $action, string $target) {
 		$form=$this->getForm();
-		$form->setProperty('data-target',$target);
-		$form->setProperty('action',$action);
+		$form->setProperty('data-target', $target);
+		$form->setProperty('action', $action);
 	}
 }

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +120 added lines, -120 removed lines

@@ -25,7 +25,7 @@ 
  *
  */
 class DataTable extends Widget {
-	use TableTrait,DataTableFieldAsTrait,HasCheckboxesTrait,BaseTrait;
+	use TableTrait, DataTableFieldAsTrait, HasCheckboxesTrait, BaseTrait;
 
 	protected $_searchField;
 
@@ -41,7 +41,7 @@ 
 
 	protected $_displayBehavior;
 
-	protected $_visibleHover = false;
+	protected $_visibleHover=false;
 
 	protected $_targetSelector;
 
@@ -51,7 +51,7 @@ 
 
 	protected $_json;
 
-	protected $_rowClass = "_element";
+	protected $_rowClass="_element";
 
 	protected $_sortable;
 
@@ -61,26 +61,26 @@ 
 
 	protected $_paginationToolbar;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	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->_urls=[];
+		$this->_emptyMessage=new HtmlMessage("", "nothing to display");
 		$this->_emptyMessage->setIcon("info circle");
 	}
 
 	public function run(JsUtils $js) {
-		if ($this->_runned !== true) {
-			$offset = $js->scriptCount();
+		if ($this->_runned!==true) {
+			$offset=$js->scriptCount();
 			if ($this->_hasCheckboxes && isset($js)) {
 				$this->_runCheckboxes($js);
 			}
 			if ($this->_visibleHover) {
-				$js->execOn("mouseover", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
+				$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'visible');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
-				$js->execOn("mouseout", "#" . $this->identifier . " tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
+				$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.currentTarget).closest('tr').find('.visibleover').css('visibility', 'hidden');$(event.currentTarget).trigger('visibleoverOut');", [
 					"preventDefault" => false,
 					"stopPropagation" => true
 				]);
@@ -96,16 +96,16 @@ 
 			if (isset($this->_pagination))
 				$this->_associatePaginationBehavior($js, $offset);
 			$this->_associateSearchFieldBehavior($js, $offset);
-			$this->_runned = true;
+			$this->_runned=true;
 		}
 	}
 
 	protected function _generateBehavior($op, $params, JsUtils $js) {
 		if (isset($this->_urls[$op])) {
-			$params = \array_merge($params, [
+			$params=\array_merge($params, [
 				"attr" => "data-ajax"
 			]);
-			$js->ajaxOnClick("#" . $this->identifier . " ._" . $op, $this->_urls[$op], $this->getTargetSelector($op), $params);
+			$js->ajaxOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector($op), $params);
 		}
 	}
 
@@ -124,21 +124,21 @@ 
 	}
 
 	public function refreshTD($fieldName, $jquery, $view) {
-		$index = $this->_getIndex($fieldName);
+		$index=$this->_getIndex($fieldName);
 		$this->compile($jquery, $view);
 		return $this->refreshTR()
 			->getTable()
 			->getCell(0, $index);
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_generated) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_generated) {
 			if (isset($this->_buttonsColumn)) {
 				$this->_instanceViewer->sortColumnContent($this->_buttonsColumn, $this->_buttons);
 			}
 			$this->_instanceViewer->setInstance($this->_model);
-			$captions = $this->_instanceViewer->getCaptions();
-			$table = $this->content["table"];
+			$captions=$this->_instanceViewer->getCaptions();
+			$table=$this->content["table"];
 			if ($this->_hasCheckboxes) {
 				$this->_generateMainCheckbox($captions);
 			}
@@ -153,14 +153,14 @@ 
 			$this->compileExtraElements($table, $captions);
 			$this->_compileSearchFieldBehavior($js);
 
-			$this->content = JArray::sortAssociative($this->content, [
+			$this->content=JArray::sortAssociative($this->content, [
 				PositionInTable::BEFORETABLE,
 				"table",
 				PositionInTable::AFTERTABLE
 			]);
 			$this->_compileForm();
 			$this->_applyStyleAttributes($table);
-			$this->_generated = true;
+			$this->_generated=true;
 		}
 		return parent::compile($js, $view);
 	}
@@ -205,21 +205,21 @@ 
 	}
 
 	protected function _generateContent($table) {
-		$objects = $this->_modelInstance;
+		$objects=$this->_modelInstance;
 		if (isset($this->_pagination)) {
-			$objects = $this->_pagination->getObjects($this->_modelInstance);
+			$objects=$this->_pagination->getObjects($this->_modelInstance);
 		}
 		InstanceViewer::setIndex(0);
-		$fields = $this->_instanceViewer->getSimpleProperties();
-		$groupByFields = $this->_instanceViewer->getGroupByFields();
-		if (! is_array($groupByFields)) {
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields) {
+		$fields=$this->_instanceViewer->getSimpleProperties();
+		$groupByFields=$this->_instanceViewer->getGroupByFields();
+		if (!is_array($groupByFields)) {
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields) {
 				return $this->_generateRow($instance, $fields, $table);
 			});
 		} else {
-			$activeValues = array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
-			$uuids = [];
-			$table->fromDatabaseObjects($objects, function ($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
+			$activeValues=array_combine($groupByFields, array_fill(0, sizeof($groupByFields), null));
+			$uuids=[];
+			$table->fromDatabaseObjects($objects, function($instance) use ($table, $fields, &$activeValues, $groupByFields, &$uuids) {
 				$this->_instanceViewer->setInstance($instance);
 				foreach ($groupByFields as $index => $gbField) {
 					$this->_generateGroupByRow($index, $gbField, $table, $fields, $activeValues, $uuids);
@@ -227,8 +227,8 @@ 
 				return $this->_generateRow($instance, $fields, $table, null, $uuids);
 			});
 		}
-		if ($table->getRowCount() == 0) {
-			$result = $table->addRow();
+		if ($table->getRowCount()==0) {
+			$result=$table->addRow();
 			$result->mergeRow();
 			$result->setValues([
 				$this->_emptyMessage
@@ -237,20 +237,20 @@ 
 	}
 
 	protected function _generateGroupByRow($index, $gbField, $table, $fields, &$activeValues, &$uuids) {
-		$newValue = $this->_instanceViewer->getValue($gbField);
-		if ($this->getElementContent($activeValues[$gbField]) !== $this->getElementContent($newValue)) {
-			if ($index == 0) {
-				$uuids = [];
+		$newValue=$this->_instanceViewer->getValue($gbField);
+		if ($this->getElementContent($activeValues[$gbField])!==$this->getElementContent($newValue)) {
+			if ($index==0) {
+				$uuids=[];
 			}
-			$uuid = uniqid("grp");
-			$uuids[$gbField] = $uuid;
-			$id = $this->_instanceViewer->getIdentifier();
-			$result = $table->addMergeRow(sizeof($fields) + 1, $newValue);
-			$result->setIdentifier($this->identifier . "-tr-gb-" . $id);
+			$uuid=uniqid("grp");
+			$uuids[$gbField]=$uuid;
+			$id=$this->_instanceViewer->getIdentifier();
+			$result=$table->addMergeRow(sizeof($fields)+1, $newValue);
+			$result->setIdentifier($this->identifier."-tr-gb-".$id);
 			$result->setProperty("data-ajax", $id);
 			$result->setProperty("data-group", $uuid);
 			$result->addToProperty("class", $this->_rowClass);
-			$activeValues[$gbField] = $newValue;
+			$activeValues[$gbField]=$newValue;
 		}
 	}
 
@@ -262,9 +262,9 @@ 
 	}
 
 	public function getFieldValue($index) {
-		$index = $this->_getIndex($index);
+		$index=$this->_getIndex($index);
 		if (is_numeric($index)) {
-			$values = $this->_instanceViewer->getValues();
+			$values=$this->_instanceViewer->getValues();
 			if (isset($values[$index])) {
 				return $values[$index];
 			}
@@ -272,31 +272,31 @@ 
 		return null;
 	}
 
-	protected function _generateRow($instance, $fields, &$table, $checkedClass = null, $uuids = null) {
+	protected function _generateRow($instance, $fields, &$table, $checkedClass=null, $uuids=null) {
 		$this->_instanceViewer->setInstance($instance);
-		InstanceViewer::$index ++;
-		$values = $this->_instanceViewer->getValues();
-		$id = $this->_instanceViewer->getIdentifier();
-		$dataAjax = $id;
-		$id = $this->cleanIdentifier($id);
+		InstanceViewer::$index++;
+		$values=$this->_instanceViewer->getValues();
+		$id=$this->_instanceViewer->getIdentifier();
+		$dataAjax=$id;
+		$id=$this->cleanIdentifier($id);
 		if ($this->_hasCheckboxes) {
-			$ck = new HtmlCheckbox("ck-" . $this->identifier . "-" . $id, "");
-			$checked = false;
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
+			$checked=false;
 			if (isset($this->_checkedCallback)) {
-				$func = $this->_checkedCallback;
-				$checked = $func($instance);
+				$func=$this->_checkedCallback;
+				$checked=$func($instance);
 			}
 			$ck->setChecked($checked);
 			// $ck->setOnChange("event.stopPropagation();");
-			$field = $ck->getField();
+			$field=$ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
 			if (isset($checkedClass))
 				$field->setClass($checkedClass);
 			\array_unshift($values, $ck);
 		}
-		$result = $table->newRow();
-		$result->setIdentifier($this->identifier . "-tr-" . $id);
+		$result=$table->newRow();
+		$result->setIdentifier($this->identifier."-tr-".$id);
 		$result->setProperty("data-ajax", $dataAjax);
 		$result->setValues($values);
 		$result->addToProperty("class", $this->_rowClass);
@@ -309,63 +309,63 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
+			if ($this->_toolbarPosition==PositionInTable::FOOTER)
 				$this->_toolbar->setFloated("left");
 		}
-		$footer = $table->getFooter();
+		$footer=$table->getFooter();
 		$footer->mergeCol();
-		$this->_paginationToolbar = $this->_pagination->generateMenu($this->identifier);
+		$this->_paginationToolbar=$this->_pagination->generateMenu($this->identifier);
 		$footer->addValues($this->_paginationToolbar);
 	}
 
-	protected function _associatePaginationBehavior(JsUtils $js = NULL, $offset = null) {
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		if (isset($this->_urls["refresh"])) {
-			$menu = $this->_pagination->getMenu();
+			$menu=$this->_pagination->getMenu();
 			if (isset($menu) && isset($js)) {
-				$js->postOnClick("#" . $menu->getIdentifier() . " .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", $this->getRefreshSelector(), [
+				$js->postOnClick("#".$menu->getIdentifier()." .item", $this->_urls["refresh"], "{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", $this->getRefreshSelector(), [
 					"preventDefault" => false,
 					"jqueryDone" => "replaceWith",
 					"hasLoader" => false,
-					"jsCallback" => '$("#' . $this->identifier . '").trigger("pageChange");$("#' . $this->identifier . '").trigger("activeRowChange");'
+					"jsCallback" => '$("#'.$this->identifier.'").trigger("pageChange");$("#'.$this->identifier.'").trigger("activeRowChange");'
 				]);
-				$page = $_POST["p"] ?? null;
+				$page=$_POST["p"] ?? null;
 				if (isset($page)) {
-					$js->execAtLast('$("#' . $this->getIdentifier() . ' .pagination").children("a.item").removeClass("active");$("#' . $this->getIdentifier() . ' .pagination").children("a.item[data-page=' . $page . ']:not(.no-active)").addClass("active");');
+					$js->execAtLast('$("#'.$this->getIdentifier().' .pagination").children("a.item").removeClass("active");$("#'.$this->getIdentifier().' .pagination").children("a.item[data-page='.$page.']:not(.no-active)").addClass("active");');
 				}
 			}
 		}
 	}
 
-	protected function _compileSearchFieldBehavior(JsUtils $js = NULL) {
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
-			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'" . JString::doubleBackSlashes($this->_model) . "'}", "#" . $this->identifier . " tbody", [
+			$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "#".$this->identifier." tbody", [
 				"preventDefault" => false,
 				"jqueryDone" => "replaceWith",
 				"hasLoader" => "internal",
-				"jsCallback" => '$("#' . $this->identifier . '").trigger("searchTerminate",[$(self).val()]);'
+				"jsCallback" => '$("#'.$this->identifier.'").trigger("searchTerminate",[$(self).val()]);'
 			]);
 		}
 	}
 
-	protected function _associateSearchFieldBehavior(JsUtils $js = NULL, $offset = null) {}
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {}
 
 	protected function _getFieldName($index) {
-		$fieldName = parent::_getFieldName($index);
+		$fieldName=parent::_getFieldName($index);
 		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
-		return $fieldName . "[]";
+			$fieldName="field-".$index;
+		return $fieldName."[]";
 	}
 
 	protected function _getFieldCaption($index) {
 		return null;
 	}
 
-	protected function applyToolbarPosition(string $position, $table, $captions = NULL) {
+	protected function applyToolbarPosition(string $position, $table, $captions=NULL) {
 		switch ($position) {
 			case PositionInTable::BEFORETABLE:
 			case PositionInTable::AFTERTABLE:
-				if (isset($this->_compileParts) === false) {
-					$this->content[$position] = $this->_toolbar;
+				if (isset($this->_compileParts)===false) {
+					$this->content[$position]=$this->_toolbar;
 				}
 				break;
 			case PositionInTable::HEADER:
@@ -376,7 +376,7 @@ 
 		}
 	}
 
-	protected function _setToolbarPosition($table, $captions = NULL) {
+	protected function _setToolbarPosition($table, $captions=NULL) {
 		if (\is_array($this->_toolbarPosition)) {
 			foreach ($this->_toolbarPosition as $tbp) {
 				$this->applyToolbarPosition($tbp, $table, $captions);
@@ -402,11 +402,11 @@ 
 	}
 
 	private function addToolbarRow($part, $table, $captions) {
-		$hasPart = $table->hasPart($part);
+		$hasPart=$table->hasPart($part);
 		if ($hasPart) {
-			$row = $table->getPart($part)->addRow(\sizeof($captions));
+			$row=$table->getPart($part)->addRow(\sizeof($captions));
 		} else {
-			$row = $table->getPart($part)->getRow(0);
+			$row=$table->getPart($part)->getRow(0);
 		}
 		$row->mergeCol();
 		$row->setValues([
@@ -438,12 +438,12 @@ 
 	 */
 	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);
-			$this->_urls["display"] = JArray::getValue($urls, "display", 3);
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
+			$this->_urls["display"]=JArray::getValue($urls, "display", 3);
 		} else {
-			$this->_urls = [
+			$this->_urls=[
 				"refresh" => $urls,
 				"edit" => $urls,
 				"delete" => $urls,
@@ -466,8 +466,8 @@ 
 	 *        	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;
 	}
 
@@ -482,8 +482,8 @@ 
 	 *        	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;
 	}
 
@@ -492,10 +492,10 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts = [
+	public function refresh($compileParts=[
 		'tbody'
 	]) {
-		$this->_compileParts = $compileParts;
+		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
@@ -505,14 +505,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...");
+		if (isset($this->_searchField)===false) {
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
 			$this->_searchField->addIcon("search", Direction::RIGHT);
 		}
 		return $this->_searchField;
@@ -540,9 +540,9 @@ 
 	}
 
 	protected function getTargetSelector($op) {
-		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		$result=$this->_targetSelector;
+		if (!isset($result[$op]))
+			$result="#".$this->identifier;
 		return $result[$op];
 	}
 
@@ -554,20 +554,20 @@ 
 	 * @return DataTable
 	 */
 	public function setTargetSelector($_targetSelector) {
-		if (! \is_array($_targetSelector)) {
-			$_targetSelector = [
+		if (!\is_array($_targetSelector)) {
+			$_targetSelector=[
 				"edit" => $_targetSelector,
 				"delete" => $_targetSelector
 			];
 		}
-		$this->_targetSelector = $_targetSelector;
+		$this->_targetSelector=$_targetSelector;
 		return $this;
 	}
 
 	public function getRefreshSelector() {
 		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
-		return "#" . $this->identifier . " tbody";
+		return "#".$this->identifier." tbody";
 	}
 
 	/**
@@ -576,7 +576,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRefreshSelector($_refreshSelector) {
-		$this->_refreshSelector = $_refreshSelector;
+		$this->_refreshSelector=$_refreshSelector;
 		return $this;
 	}
 
@@ -588,9 +588,9 @@ 
 	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);
+				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getRowClass() {
@@ -604,7 +604,7 @@ 
 	 * @return DataTable
 	 */
 	public function setRowClass($_rowClass) {
-		$this->_rowClass = $_rowClass;
+		$this->_rowClass=$_rowClass;
 		return $this;
 	}
 
@@ -615,16 +615,16 @@ 
 	 * @return DataTable
 	 */
 	public function setEmptyMessage($_emptyMessage) {
-		$this->_emptyMessage = $_emptyMessage;
+		$this->_emptyMessage=$_emptyMessage;
 		return $this;
 	}
 
-	public function setSortable($colIndex = NULL) {
-		$this->_sortable = $colIndex;
+	public function setSortable($colIndex=NULL) {
+		$this->_sortable=$colIndex;
 		return $this;
 	}
 
-	public function setActiveRowSelector($class = "active", $event = "click", $multiple = false) {
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
 		$this->_self->setActiveRowSelector($class, $event, $multiple);
 		return $this;
 	}
@@ -634,19 +634,19 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
-		$this->_hiddenColumns[] = $colIndex;
+		if (!\is_array($this->_hiddenColumns))
+			$this->_hiddenColumns=[];
+		$this->_hiddenColumns[]=$colIndex;
 		return $this;
 	}
 
 	public function setColWidth($colIndex, $width) {
-		$this->_colWidths[$colIndex] = $width;
+		$this->_colWidths[$colIndex]=$width;
 		return $this;
 	}
 
 	public function setColWidths($_colWidths) {
-		$this->_colWidths = $_colWidths;
+		$this->_colWidths=$_colWidths;
 		return $this;
 	}
 
@@ -655,7 +655,7 @@ 
 		return $this;
 	}
 
-	public function trigger($event, $params = "[]") {
+	public function trigger($event, $params="[]") {
 		return $this->getHtmlComponent()->trigger($event, $params);
 	}
 
@@ -693,7 +693,7 @@ 
 	 * @param mixed $_displayBehavior
 	 */
 	public function setDisplayBehavior($_displayBehavior) {
-		$this->_displayBehavior = $_displayBehavior;
+		$this->_displayBehavior=$_displayBehavior;
 	}
 
 	/**
@@ -712,9 +712,9 @@ 
 		$this->_instanceViewer->setGroupByFields($_groupByFields);
 	}
 	
-	public function addGroupBy($index){
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+	public function addGroupBy($index) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->addGroupBy($index);
 		}
 	}
@@ -724,7 +724,7 @@ 
 	 * @param boolean $_visibleHover
 	 */
 	public function setVisibleHover($_visibleHover) {
-		$this->_visibleHover = $_visibleHover;
+		$this->_visibleHover=$_visibleHover;
 	}
 
 	/**
@@ -735,7 +735,7 @@ 
 		return $this->_paginationToolbar;
 	}
 
-	public function setInverted($recursive = true) {
+	public function setInverted($recursive=true) {
 		$this->getHtmlComponent()->setInverted($recursive);
 		if ($this->_emptyMessage instanceof HtmlSemDoubleElement) {
 			$this->_emptyMessage->setInverted($recursive);

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +110 added lines, -110 removed lines

@@ -29,17 +29,17 @@ 
 
 	protected $groupByFields;
 
-	public static $index = 0;
+	public static $index=0;
 
-	public function __construct($identifier, $instance = NULL, $captions = NULL) {
-		$this->widgetIdentifier = $identifier;
-		$this->values = [];
-		$this->afterCompile = [];
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
+		$this->widgetIdentifier=$identifier;
+		$this->values=[];
+		$this->afterCompile=[];
 		if (isset($instance))
 			$this->setInstance($instance);
 		$this->setCaptions($captions);
-		$this->captionCallback = NULL;
-		$this->defaultValueFunction = function ($name, $value) {
+		$this->captionCallback=NULL;
+		$this->defaultValueFunction=function($name, $value) {
 			return $value;
 		};
 	}
@@ -66,47 +66,47 @@ 
 	}
 
 	public function getValues() {
-		$values = [];
-		$index = 0;
-		$count = $this->count();
-		$hasGroupby = is_array($this->groupByFields);
-		if (! $hasGroupby) {
-			while ($index < $count) {
-				$values[] = $this->getValue($index ++);
+		$values=[];
+		$index=0;
+		$count=$this->count();
+		$hasGroupby=is_array($this->groupByFields);
+		if (!$hasGroupby) {
+			while ($index<$count) {
+				$values[]=$this->getValue($index++);
 			}
 		} else {
-			while ($index < $count) {
-				if (array_search($index, $this->groupByFields) === false) {
-					$values[] = $this->getValue($index);
+			while ($index<$count) {
+				if (array_search($index, $this->groupByFields)===false) {
+					$values[]=$this->getValue($index);
 				}
-				$index ++;
+				$index++;
 			}
 		}
 		return $values;
 	}
 
-	public function getIdentifier($index = NULL) {
-		if (! isset($index))
-			$index = self::$index;
-		$value = $index;
+	public function getIdentifier($index=NULL) {
+		if (!isset($index))
+			$index=self::$index;
+		$value=$index;
 		if (isset($this->values["identifier"])) {
 			if (\is_string($this->values["identifier"]))
-				$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
+				$value=JReflection::callMethod($this->instance, $this->values["identifier"], []);
 			else
-				$value = $this->values["identifier"]($index, $this->instance);
+				$value=$this->values["identifier"]($index, $this->instance);
 		}
 		return $value;
 	}
 
 	public function getValue($index) {
-		$property = $this->properties[$index];
+		$property=$this->properties[$index];
 		return $this->_getValue($property, $index);
 	}
 
 	protected function _beforeAddProperty($index, &$field) {}
 
 	protected function _getDefaultValue($name, $value, $index) {
-		$func = $this->defaultValueFunction;
+		$func=$this->defaultValueFunction;
 		return $func($name, $value, $index, $this->instance);
 	}
 
@@ -116,27 +116,27 @@ 
 	}
 
 	protected function _getValue($property, $index) {
-		$value = null;
-		$propertyName = $property;
+		$value=null;
+		$propertyName=$property;
 		if ($property instanceof \ReflectionProperty) {
-			$value = $this->_getPropertyValue($property);
-			$propertyName = $property->getName();
-		} elseif (\is_callable($property) && \array_search($property, ['system','date']) === false){
-			try{
-				$value = $property($this->instance);
-			}catch(\Error $e){}
+			$value=$this->_getPropertyValue($property);
+			$propertyName=$property->getName();
+		} elseif (\is_callable($property) && \array_search($property, ['system', 'date'])===false) {
+			try {
+				$value=$property($this->instance);
+			}catch (\Error $e) {}
 		}
 		elseif (\is_array($property)) {
-			$values = \array_map(function ($v) use ($index) {
+			$values=\array_map(function($v) use ($index) {
 				return $this->_getValue($v, $index);
 			}, $property);
-			$value = \implode('', $values);
+			$value=\implode('', $values);
 		} elseif (\is_string($property)) {
-			$value = '';
+			$value='';
 			if (isset($this->instance->{$property})) {
-				$value = $this->instance->{$property};
-			} elseif (\method_exists($this->instance, $getter = JReflection::getterName($property))) {
-				$value = JReflection::callMethod($this->instance, $getter, []);
+				$value=$this->instance->{$property};
+			} elseif (\method_exists($this->instance, $getter=JReflection::getterName($property))) {
+				$value=JReflection::callMethod($this->instance, $getter, []);
 			}
 		}
 
@@ -145,9 +145,9 @@ 
 
 	protected function _postGetValue($index, $propertyName, $value) {
 		if (isset($this->values[$index])) {
-			$value = $this->values[$index]($value, $this->instance, $index, self::$index);
+			$value=$this->values[$index]($value, $this->instance, $index, self::$index);
 		} else {
-			$value = $this->_getDefaultValue($propertyName, $value, $index);
+			$value=$this->_getDefaultValue($propertyName, $value, $index);
 		}
 		if (isset($this->afterCompile[$index])) {
 			if (\is_callable($this->afterCompile[$index])) {
@@ -157,7 +157,7 @@ 
 		return $value;
 	}
 
-	public function insertField($index, $field, $key = null) {
+	public function insertField($index, $field, $key=null) {
 		if (isset($key)) {
 			array_splice($this->visibleProperties, $index, 0, [
 				$key => $field
@@ -171,29 +171,29 @@ 
 	public function sortColumnContent($index, $array) {
 		if (isset($this->visibleProperties[$index])) {
 			if (is_array($this->visibleProperties[$index])) {
-				$this->visibleProperties[$index] = JArray::sortAssociative($this->visibleProperties[$index], $array);
+				$this->visibleProperties[$index]=JArray::sortAssociative($this->visibleProperties[$index], $array);
 			}
 		}
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$vb = $this->visibleProperties;
+	public function insertInField($index, $field, $key=null) {
+		$vb=$this->visibleProperties;
 		if (isset($vb[$index])) {
 			if (isset($key)) {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][$key] = $field;
+					$this->visibleProperties[$index][$key]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$key => $field
 					];
 				}
 			} else {
 				if (\is_array($vb[$index])) {
-					$this->visibleProperties[$index][] = $field;
+					$this->visibleProperties[$index][]=$field;
 				} else {
-					$this->visibleProperties[$index] = [
+					$this->visibleProperties[$index]=[
 						$vb[$index],
 						$field
 					];
@@ -205,19 +205,19 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		if (isset($key)) {
-			$this->visibleProperties[] = [
+			$this->visibleProperties[]=[
 				$key => $field
 			];
 		} else {
-			$this->visibleProperties[] = $field;
+			$this->visibleProperties[]=$field;
 		}
 		return $this;
 	}
 
 	public function addFields($fields) {
-		$this->visibleProperties = \array_merge($this->visibleProperties, $fields);
+		$this->visibleProperties=\array_merge($this->visibleProperties, $fields);
 		return $this;
 	}
 
@@ -234,30 +234,30 @@ 
 	}
 
 	public function getFieldName($index) {
-		$property = $this->getProperty($index);
+		$property=$this->getProperty($index);
 		if ($property instanceof \ReflectionProperty) {
-			$result = $property->getName();
+			$result=$property->getName();
 		} elseif (\is_callable($property)) {
-			$result = $this->visibleProperties[$index];
+			$result=$this->visibleProperties[$index];
 		} else {
-			$result = $property;
+			$result=$property;
 		}
 		return $result;
 	}
 
 	protected function showableProperty(\ReflectionProperty $rProperty) {
-		return JString::startswith($rProperty->getName(), "_") === false;
+		return JString::startswith($rProperty->getName(), "_")===false;
 	}
 
 	public function setInstance($instance) {
 		if (\is_string($instance)) {
-			$instance = new $instance();
+			$instance=new $instance();
 		}
-		$this->instance = $instance;
-		$this->properties = [];
-		$this->reflect = new \ReflectionClass($instance);
-		if (JArray::count($this->visibleProperties) === 0) {
-			$this->properties = $this->getDefaultProperties();
+		$this->instance=$instance;
+		$this->properties=[];
+		$this->reflect=new \ReflectionClass($instance);
+		if (JArray::count($this->visibleProperties)===0) {
+			$this->properties=$this->getDefaultProperties();
 		} else {
 			foreach ($this->visibleProperties as $property) {
 				$this->setInstanceProperty($property);
@@ -268,56 +268,56 @@ 
 
 	private function setInstanceProperty($property) {
 		if (\is_callable($property)) {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		} elseif (\is_string($property)) {
 			try {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$rProperty = $this->reflect->getProperty($property);
-				$this->properties[] = $rProperty;
-			} catch (\Exception $e) {
+				$rProperty=$this->reflect->getProperty($property);
+				$this->properties[]=$rProperty;
+			}catch (\Exception $e) {
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 			}
 		} elseif (\is_int($property)) {
-			$props = $this->getDefaultProperties();
+			$props=$this->getDefaultProperties();
 			if (isset($props[$property]))
-				$this->properties[] = $props[$property];
+				$this->properties[]=$props[$property];
 			else
-				$this->properties[] = $property;
+				$this->properties[]=$property;
 		} else {
-			$this->properties[] = $property;
+			$this->properties[]=$property;
 		}
 	}
 
 	protected function getDefaultProperties() {
-		$result = [];
-		$properties = $this->reflect->getProperties();
+		$result=[];
+		$properties=$this->reflect->getProperties();
 		foreach ($properties as $property) {
-			$showable = $this->showableProperty($property);
-			if ($showable !== false) {
-				$result[] = $property;
+			$showable=$this->showableProperty($property);
+			if ($showable!==false) {
+				$result[]=$property;
 			}
 		}
 		return $result;
 	}
 
 	public function setVisibleProperties($visibleProperties) {
-		$this->visibleProperties = $visibleProperties;
+		$this->visibleProperties=$visibleProperties;
 		return $this;
 	}
 
 	public function setValueFunction($index, $callback) {
-		$this->values[$index] = $callback;
+		$this->values[$index]=$callback;
 		return $this;
 	}
 
 	public function setIdentifierFunction($callback) {
-		$this->values["identifier"] = $callback;
+		$this->values["identifier"]=$callback;
 		return $this;
 	}
 
 	public static function setIndex($index) {
-		self::$index = $index;
+		self::$index=$index;
 	}
 
 	public function getProperties() {
@@ -337,43 +337,43 @@ 
 	}
 
 	public function getCaptions() {
-		$hasGroupby = is_array($this->groupByFields);
-		$count = $this->count();
-		$moreAdded = false;
+		$hasGroupby=is_array($this->groupByFields);
+		$count=$this->count();
+		$moreAdded=false;
 		if (isset($this->captions)) {
-			$captions = \array_values($this->captions);
-			$gbSize = $hasGroupby ? sizeof($this->groupByFields) : 0;
-			$captionsSize = \sizeof($captions);
-			for ($i = $captionsSize; $i < $count - $gbSize; $i ++) {
-				$captions[] = "";
-				$moreAdded = true;
+			$captions=\array_values($this->captions);
+			$gbSize=$hasGroupby ? sizeof($this->groupByFields) : 0;
+			$captionsSize=\sizeof($captions);
+			for ($i=$captionsSize; $i<$count-$gbSize; $i++) {
+				$captions[]="";
+				$moreAdded=true;
 			}
 		} else {
-			$captions = [];
-			$index = 0;
-			while ($index < $count) {
-				$captions[] = $this->getCaption($index ++);
+			$captions=[];
+			$index=0;
+			while ($index<$count) {
+				$captions[]=$this->getCaption($index++);
 			}
 		}
-		if ($hasGroupby && sizeof($captions) >= $count && ! $moreAdded) {
-			$captions = JArray::removeByKeys($captions, $this->groupByFields);
+		if ($hasGroupby && sizeof($captions)>=$count && !$moreAdded) {
+			$captions=JArray::removeByKeys($captions, $this->groupByFields);
 		}
 		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
-			$callback = $this->captionCallback;
+			$callback=$this->captionCallback;
 			$callback($captions, $this->instance);
 		}
 		return $captions;
 	}
 
 	public function setCaption($index, $caption) {
-		if (isset($this->captions) === false)
-			$this->captions = [];
-		$this->captions[$index] = $caption;
+		if (isset($this->captions)===false)
+			$this->captions=[];
+		$this->captions[$index]=$caption;
 		return $this;
 	}
 
 	public function setCaptions($captions) {
-		$this->captions = $captions;
+		$this->captions=$captions;
 		return $this;
 	}
 
@@ -388,7 +388,7 @@ 
 	 * @return InstanceViewer
 	 */
 	public function afterCompile($index, $callback) {
-		$this->afterCompile[$index] = $callback;
+		$this->afterCompile[$index]=$callback;
 		return $this;
 	}
 
@@ -400,7 +400,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setCaptionCallback($captionCallback) {
-		$this->captionCallback = $captionCallback;
+		$this->captionCallback=$captionCallback;
 		return $this;
 	}
 
@@ -412,7 +412,7 @@ 
 	 * @return \Ajax\semantic\widgets\base\InstanceViewer
 	 */
 	public function setDefaultValueFunction($defaultValueFunction) {
-		$this->defaultValueFunction = $defaultValueFunction;
+		$this->defaultValueFunction=$defaultValueFunction;
 		return $this;
 	}
 
@@ -421,8 +421,8 @@ 
 	}
 
 	public function getSimpleProperties() {
-		return array_filter($this->visibleProperties, function ($item) {
-			return ! (is_array($item) || is_object($item));
+		return array_filter($this->visibleProperties, function($item) {
+			return !(is_array($item) || is_object($item));
 		});
 	}
 
@@ -447,10 +447,10 @@ 
 	 * @param mixed $groupByFields
 	 */
 	public function setGroupByFields($groupByFields) {
-		$this->groupByFields = $groupByFields;
+		$this->groupByFields=$groupByFields;
 	}
 	
-	public function addGroupBy($groupByField){
+	public function addGroupBy($groupByField) {
 		$this->groupByFields[]=$groupByField;
 	}