phpMv / phpMv-UI

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

Spacing +27 added lines, -27 removed lines

@@ -11,7 +11,7 @@ 
  *
  */
 class HtmlTableContent extends HtmlSemCollection {
-	protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ];
+	protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"];
 
 	/**
 	 *
@@ -34,7 +34,7 @@ 
 	 */
 	public function setRowCount($rowCount, $colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $rowCount; $i++) {
+		for ($i=$count; $i<$rowCount; $i++) {
 			$this->addItem($colCount);
 		}
 		return $this;
@@ -56,7 +56,7 @@ 
 		$tr=new HtmlTR("", $value);
 		$tr->setContainer($this, $count);
 		$tr->setTdTagName($this->_tdTagNames[$this->tagName]);
-		if (isset($value) === true) {
+		if (isset($value)===true) {
 			$tr->setColCount($value);
 		}
 		return $tr;
@@ -114,7 +114,7 @@ 
 	 */
 	public function setCellValue($row, $col, $value="") {
 		$cell=$this->getCell($row, $col);
-		if (isset($cell) === true) {
+		if (isset($cell)===true) {
 			$cell->setValue($value);
 		}
 		return $this;
@@ -125,7 +125,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function($row,$_values){$row->setValues($_values);});
+		return $this->_addOrSetValues($values, function($row, $_values) {$row->setValues($_values); });
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function($row,$_values){$row->addValues($_values);});
+		return $this->_addOrSetValues($values, function($row, $_values) {$row->addValues($_values); });
 	}
 
 	/**
@@ -141,21 +141,21 @@ 
 	 * @param mixed $values
 	 * @param callable $callback
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		$isArray=true;
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 			$isArray=false;
 		}
-		if (JArray::dimension($values) == 1 && $isArray)
-			$values=[ $values ];
+		if (JArray::dimension($values)==1 && $isArray)
+			$values=[$values];
 
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$row=$this->content[$i];
-			$callback($row,$values[$i]);
+			$callback($row, $values[$i]);
 		}
 		return $this;
 	}
@@ -166,7 +166,7 @@ 
 			$values=\array_fill(0, $count, $values);
 		}
 		$count=\min(\sizeof($values), $count);
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->setValue($values[$i]);
 		}
 		return $this;
@@ -174,7 +174,7 @@ 
 
 	public function addColVariations($colIndex, $variations=array()) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$this->getCell($i, $colIndex)->addVariations($variations);
 		}
 		return $this;
@@ -191,9 +191,9 @@ 
 
 	private function colAlign($colIndex, $function) {
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$index=$this->content[$i]->getColPosition($colIndex);
-			if ($index !== NULL)
+			if ($index!==NULL)
 				$this->getCell($i, $index)->$function();
 		}
 		return $this;
@@ -225,7 +225,7 @@ 
 	 */
 	public function getColCount() {
 		$result=0;
-		if ($this->count() > 0)
+		if ($this->count()>0)
 			$result=$this->getItem(0)->count();
 		return $result;
 	}
@@ -239,7 +239,7 @@ 
 	public function delete($rowIndex, $colIndex=NULL) {
 		if (isset($colIndex)) {
 			$row=$this->getItem($rowIndex);
-			if (isset($row) === true) {
+			if (isset($row)===true) {
 				$row->delete($colIndex);
 			}
 		} else {
@@ -272,17 +272,17 @@ 
 	 */
 	public function conditionalCellFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalCellFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function conditionalColFormat($colIndex,$callback,$format){
+	public function conditionalColFormat($colIndex, $callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->conditionnalCellFormat($callback,$format);
+			$cell->conditionnalCellFormat($callback, $format);
 		}
 		return $this;
 	}
@@ -294,17 +294,17 @@ 
 	 */
 	public function conditionalRowFormat($callback, $format) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->conditionalRowFormat($callback, $format);
 		}
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
+	public function hideColumn($colIndex) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$cell=$row->getItem($colIndex);
-			$cell->addToProperty("style","display:none;");
+			$cell->addToProperty("style", "display:none;");
 		}
 		return $this;
 	}
@@ -315,7 +315,7 @@ 
 	 */
 	public function applyCells($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->applyCells($callback);
 		}
 		return $this;
@@ -327,7 +327,7 @@ 
 	 */
 	public function applyRows($callback) {
 		$rows=$this->content;
-		foreach ( $rows as $row ) {
+		foreach ($rows as $row) {
 			$row->apply($callback);
 		}
 		return $this;

Ajax/semantic/html/modules/HtmlModal.php

Spacing +50 added lines, -50 removed lines

@@ -15,117 +15,117 @@ 
 	protected $_paramParts=array();
 
 	public function __construct($identifier, $header="", $content="", $actions=null) {
-		parent::__construct($identifier, "div","ui modal");
-		if(isset($header)){
+		parent::__construct($identifier, "div", "ui modal");
+		if (isset($header)) {
 			$this->setHeader($header);
 		}
-		if(isset($content)){
+		if (isset($content)) {
 			$this->setContent($content);
 		}
-		if(isset($actions)){
+		if (isset($actions)) {
 			$this->setActions($actions);
 		}
 	}
 
 	public function setHeader($value) {
-		$this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value);
+		$this->content["header"]=new HtmlSemDoubleElement("header-".$this->identifier, "a", "header", $value);
 		return $this;
 	}
 
 	public function setContent($value) {
-		$this->content["content"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "content", $value);
+		$this->content["content"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "content", $value);
 		return $this;
 	}
 
 	public function setActions($actions) {
-		$this->content["actions"]=new HtmlSemDoubleElement("content-" . $this->identifier, "div", "actions");
-		if(\is_array($actions)){
-			foreach ($actions as $action){
+		$this->content["actions"]=new HtmlSemDoubleElement("content-".$this->identifier, "div", "actions");
+		if (\is_array($actions)) {
+			foreach ($actions as $action) {
 				$this->addAction($action);
 			}
 		}
-		else{
+		else {
 			$this->addAction($actions);
 		}
 		return $this;
 	}
 
-	public function addAction($action){
-		if(!$action instanceof BaseHtml){
+	public function addAction($action) {
+		if (!$action instanceof BaseHtml) {
 			$class="";
-			if(\array_search($action, ["Okay","Yes"])!==false){
+			if (\array_search($action, ["Okay", "Yes"])!==false) {
 				$class="approve";
 			}
-			if(\array_search($action, ["Close","Cancel","No"])!==false){
+			if (\array_search($action, ["Close", "Cancel", "No"])!==false) {
 				$class="cancel";
 			}
-			$action=new HtmlButton("action-".$this->identifier,$action);
-			if($class!=="")
+			$action=new HtmlButton("action-".$this->identifier, $action);
+			if ($class!=="")
 				$action->addToProperty("class", $class);
 		}
 		return $this->addElementInPart($action, "actions");
 	}
 
-	public function addContent($content,$before=false){
-		$this->content["content"]->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->content["content"]->addContent($content, $before);
 		return $this;
 	}
 
-	public function addImageContent($image,$description=NULL){
+	public function addImageContent($image, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($image!==""){
-			$img=new HtmlImage("image-".$this->identifier,$image,"","medium");
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($image!=="") {
+			$img=new HtmlImage("image-".$this->identifier, $image, "", "medium");
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	public function addIconContent($icon,$description=NULL){
+	public function addIconContent($icon, $description=NULL) {
 		$content=$this->content["content"];
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("description-".$this->identifier,"div","description",$description);
-			$content->addContent($description,true);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("description-".$this->identifier, "div", "description", $description);
+			$content->addContent($description, true);
 		}
-		if($icon!==""){
-			$img=new HtmlIcon("image-".$this->identifier,$icon);
-			$content->addContent($img,true);
-			$content->addToProperty("class","image");
+		if ($icon!=="") {
+			$img=new HtmlIcon("image-".$this->identifier, $icon);
+			$content->addContent($img, true);
+			$content->addToProperty("class", "image");
 		}
 		return $this;
 	}
 
-	private function addContentInPart($content,$uiClass,$part) {
-		return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part);
+	private function addContentInPart($content, $uiClass, $part) {
+		return $this->addElementInPart(new HtmlSemDoubleElement($part."-".$this->identifier, "div", $uiClass, $content), $part);
 	}
 
-	private function addElementInPart($element,$part) {
+	private function addElementInPart($element, $part) {
 		$this->content[$part]->addContent($element);
 		return $element;
 	}
 
-	public function showDimmer($value){
-		$value=$value?"show":"hide";
+	public function showDimmer($value) {
+		$value=$value ? "show" : "hide";
 		$this->_paramParts[]=["'".$value." dimmer'"];
 		return $this;
 	}
 
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		$this->_params["inverted"]=true;
 		return $this;
 	}
 
-	public function setBasic(){
+	public function setBasic() {
 		return $this->addToProperty("class", "basic");
 	}
 
 
-	public function setTransition($value){
-		$this->_paramParts[]=["'setting'","'transition'","'".$value."'"];
+	public function setTransition($value) {
+		$this->_paramParts[]=["'setting'", "'transition'", "'".$value."'"];
 	}
 
 	/**
@@ -135,8 +135,8 @@ 
 	 * @param string $viewName
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderView(JsUtils $js,$initialController,$viewName, $params=array()) {
-		return $this->setContent($js->renderContent($initialController, $viewName,$params));
+	public function renderView(JsUtils $js, $initialController, $viewName, $params=array()) {
+		return $this->setContent($js->renderContent($initialController, $viewName, $params));
 	}
 
 	/**
@@ -147,8 +147,8 @@ 
 	 * @param string $actionName the action name
 	 * @param array $params
 	 */
-	public function forward(JsUtils $js,$initialControllerInstance,$controllerName,$actionName,$params=NULL){
-		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName,$params));
+	public function forward(JsUtils $js, $initialControllerInstance, $controllerName, $actionName, $params=NULL) {
+		return $this->setContent($js->forward($initialControllerInstance, $controllerName, $actionName, $params));
 	}
 
 	/**
@@ -158,7 +158,7 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->content=JArray::sortAssociative($this->content, ["header","content","actions" ]);
+		$this->content=JArray::sortAssociative($this->content, ["header", "content", "actions"]);
 		return parent::compile($js, $view);
 	}
 	/*
@@ -166,8 +166,8 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if(isset($this->_bsComponent)===false)
-			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->modal("#".$this->identifier, $this->_params, $this->_paramParts);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}

Ajax/semantic/html/elements/HtmlDivider.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlDivider
 	 */
 	public function setVertical() {
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical","horizontal" ));
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical", "horizontal"));
 	}
 
 	/**
@@ -30,7 +30,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlDivider
 	 */
 	public function setHorizontal() {
-		return $this->addToPropertyCtrl("class", "horizontal", array ("vertical","horizontal" ));
+		return $this->addToPropertyCtrl("class", "horizontal", array("vertical", "horizontal"));
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 		return $this->addToProperty("class", "header");
 	}
 
-	public function setIgnored(){
+	public function setIgnored() {
 		return $this->addToProperty("class", "ignored");
 	}
 }
\ No newline at end of file

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

Spacing +13 added lines, -13 removed lines

@@ -7,12 +7,12 @@ 
  * @author jc
  * @property HtmlTable $_self
  */
-trait TableTrait{
+trait TableTrait {
 
 	abstract public function addEvent($event, $jsCode, $stopPropagation=false, $preventDefault=false);
 	abstract public function getOn($event, $url, $responseElement="", $parameters=array());
 
-	protected function addToPropertyTable($property,$value){
+	protected function addToPropertyTable($property, $value) {
 		return $this->_self->addToProperty($property, $value);
 	}
 
@@ -23,15 +23,15 @@ 
 	public function setBasic($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "basic", array ("basic" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "basic", array("basic"));
 	}
 
 	public function setCompact($very=false) {
 		$table=$this->_self;
 		if ($very)
-			$table->addToPropertyCtrl("class", "very", array ("very" ));
-		return $table->addToPropertyCtrl("class", "compact", array ("compact" ));
+			$table->addToPropertyCtrl("class", "very", array("very"));
+		return $table->addToPropertyCtrl("class", "compact", array("compact"));
 	}
 
 	public function setCollapsing() {
@@ -70,16 +70,16 @@ 
 		return $this->addToPropertyTable("class", "striped");
 	}
 
-	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false){
-		$this->onRowClick($jsCode,$stopPropagation,$preventDefault);
+	public function onRowClick($jsCode, $stopPropagation=false, $preventDefault=false) {
+		$this->onRowClick($jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function onRow($event,$jsCode, $stopPropagation=false, $preventDefault=false){
-		$this->_self->addEvent($event."{{tr}}",$jsCode,$stopPropagation,$preventDefault);
+	public function onRow($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		$this->_self->addEvent($event."{{tr}}", $jsCode, $stopPropagation, $preventDefault);
 	}
 
-	public function getOnRow($event, $url, $responseElement="", $parameters=array()){
-		$parameters=\array_merge($parameters,["stopPropagation"=>false,"preventDefault"=>false]);
-		return $this->_self->getOn($event."{{tbody tr}}", $url,$responseElement,$parameters);
+	public function getOnRow($event, $url, $responseElement="", $parameters=array()) {
+		$parameters=\array_merge($parameters, ["stopPropagation"=>false, "preventDefault"=>false]);
+		return $this->_self->getOn($event."{{tbody tr}}", $url, $responseElement, $parameters);
 	}
 }
\ No newline at end of file

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

Spacing +33 added lines, -33 removed lines

@@ -27,10 +27,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=[];
 	}
 
@@ -40,17 +40,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"];
@@ -95,7 +95,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -291,7 +291,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();
 		}
@@ -301,9 +301,9 @@ 
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		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'));");
 		}
-		if(isset($this->_activeRowSelector)){
+		if (isset($this->_activeRowSelector)) {
 			$this->_activeRowSelector->compile();
 		}
 	}
@@ -317,13 +317,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;
 	}
@@ -338,14 +338,14 @@ 
 		return $this;
 	}
 
-	public function refresh(){
+	public function refresh() {
 		$this->_footer=$this->getFooter();
 		$this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");');
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
-		if(isset($this->_footer))
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		return $result;
 	}
@@ -368,38 +368,38 @@ 
 	 * @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 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]);
 			}
 		}

Ajax/semantic/html/base/traits/BaseTrait.php

Spacing +27 added lines, -27 removed lines

@@ -15,8 +15,8 @@ 
  * @property HtmlSemDoubleElement $_self
  */
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -29,7 +29,7 @@ 
 
 	abstract public function setProperty($name, $value);
 
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	abstract public function onCreate($jsCode);
 
@@ -50,7 +50,7 @@ 
 		$this->_self->setProperty("class", $this->_self->_baseClass);
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->_self->addVariation($variation);
 		}
 		return $this;
@@ -64,7 +64,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->_self->addVariation($variation);
 		}
 		return $this;
@@ -73,7 +73,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->_self->addState($state);
 		}
 		return $this;
@@ -83,17 +83,17 @@ 
 		$this->_self->setProperty("class", $this->_self->_baseClass);
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->_self->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->identifier, $icon), $before);
+		return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->identifier, $icon), $before);
 	}
 
-	public function addSticky($context="body"){
+	public function addSticky($context="body") {
 		$this->_self->onCreate("$('#".$this->_self->identifier."').sticky({ context: '".$context."'});");
 		return $this;
 	}
@@ -114,7 +114,7 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
+		if ($disable)
 			$this->_self->addToProperty("class", "disabled");
 		return $this;
 	}
@@ -140,7 +140,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asHeader(){
+	public function asHeader() {
 		return $this->_self->addToProperty("class", "header");
 	}
 
@@ -148,15 +148,15 @@ 
 	 * show it is currently the active user selection
 	 * @return HtmlSemDoubleElement
 	 */
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->_self->addToProperty("class", "active");
 		return $this;
 	}
 
-	public function setAttached($value=true){
-		if($value)
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
+	public function setAttached($value=true) {
+		if ($value)
+			$this->_self->addToPropertyCtrl("class", "attached", array("attached"));
 		return $this;
 	}
 
@@ -164,13 +164,13 @@ 
 	 * can be formatted to appear on dark backgrounds
 	 */
 	public function setInverted($recursive=true) {
-		if($recursive===true){
+		if ($recursive===true) {
 			$content=$this->_self->getContent();
-			if($content instanceof HtmlSemDoubleElement)
+			if ($content instanceof HtmlSemDoubleElement)
 				$content->setInverted($recursive);
-			elseif(\is_array($content) || $content instanceof \Traversable){
-				foreach ($content as $elm){
-					if($elm instanceof  HtmlSemDoubleElement){
+			elseif (\is_array($content) || $content instanceof \Traversable) {
+				foreach ($content as $elm) {
+					if ($elm instanceof  HtmlSemDoubleElement) {
 						$elm->setInverted($recursive);
 					}
 				}
@@ -184,7 +184,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {
@@ -199,14 +199,14 @@ 
 		return $this->_self->_baseClass;
 	}
 
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
-		if(\is_string($value)){
-			if(isset($array[$key])){
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
+		if (\is_string($value)) {
+			if (isset($array[$key])) {
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
+			} else
 				$array[$key]=$before.$value.$after;
-		}else{
+		} else {
 			$array[$key]=$value;
 		}
 		return $this;

Ajax/semantic/widgets/dataform/DataForm.php

Spacing +33 added lines, -33 removed lines

@@ -21,85 +21,85 @@ 
 	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) {
 				//$form->addField($v);
 				$this->_generateFields($form, [$v], $headers, $i, $i+1, $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], $separators[$i+1], $wrappers);
 			}
 		}
 	}
 
-	protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){
+	protected function _generateFields($form, $values, $headers, $sepFirst, $sepLast, $wrappers) {
 		$wrapper=null;
 		//$fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst);
-		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;
@@ -114,12 +114,12 @@ 
 		return $this;
 	}
 
-	public function fieldAsReset($index,$cssStyle=NULL,$attributes=NULL){
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
-			$button=new HtmlButton($id,$value,$cssStyle);
+	public function fieldAsReset($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
+			$button=new HtmlButton($id, $value, $cssStyle);
 			$button->setProperty("type", "reset");
 			return $button;
-		}, $index,$attributes);
+		}, $index, $attributes);
 	}
 
 	/**
@@ -138,19 +138,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) {
 		return parent::run($js);
 	}
 }
\ No newline at end of file

Ajax/semantic/widgets/datatable/DataTable.php

Spacing +101 added lines, -101 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);
 		return parent::run($js);
 	}
 
 
 
-	protected function _generateBehavior($op,$params,JsUtils $js){
-		if(isset($this->_urls[$op])){
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
-			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector(),$params);
+	protected function _generateBehavior($op, $params, JsUtils $js) {
+		if (isset($this->_urls[$op])) {
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
+			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector(), $params);
 		}
 	}
 
@@ -83,154 +83,154 @@ 
 	}
 
 
-	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);
 
-			if(isset($this->_searchField) && isset($js)){
-				if(isset($this->_urls["refresh"]))
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
+			if (isset($this->_searchField) && isset($js)) {
+				if (isset($this->_urls["refresh"]))
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
 			}
 
 			$this->_generateContent($table);
 
-			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);
 			}
 
-			$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 _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();
-		if($this->_hasCheckboxes){
-			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id,"");
+		if ($this->_hasCheckboxes) {
+			$ck=new HtmlCheckbox("ck-".$this->identifier."-".$id, "");
 			$ck->setOnChange("event.stopPropagation();");
 			$field=$ck->getField();
-			$field->setProperty("value",$id);
+			$field->setProperty("value", $id);
 			$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",$id);
+		$result->setProperty("data-ajax", $id);
 		$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"]);
+	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"]);
 		}
 	}
 
-	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;
 		}
 	}
@@ -242,16 +242,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();
@@ -263,7 +263,7 @@ 
 	 * @see Widget::getHtmlComponent()
 	 * @return HtmlTable
 	 */
-	public function getHtmlComponent(){
+	public function getHtmlComponent() {
 		return $this->content["table"];
 	}
 
@@ -277,12 +277,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;
 	}
@@ -295,8 +295,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;
 	}
 
@@ -307,8 +307,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;
 	}
 
@@ -318,20 +318,20 @@ 
 	 * @param array $compileParts
 	 * @return DataTable
 	 */
-	public function refresh($compileParts=["tbody"]){
+	public function refresh($compileParts=["tbody"]) {
 		$this->_compileParts=$compileParts;
 		return $this;
 	}
 
 
-	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;
 	}
@@ -347,7 +347,7 @@ 
 		return $this;
 	}
 
-	public function asForm(){
+	public function asForm() {
 		return $this->getForm();
 	}
 
@@ -355,7 +355,7 @@ 
 
 	protected function getTargetSelector() {
 		$result=$this->_targetSelector;
-		if(!isset($result))
+		if (!isset($result))
 			$result="#".$this->identifier;
 		return $result;
 	}
@@ -371,7 +371,7 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if(isset($this->_refreshSelector))
+		if (isset($this->_refreshSelector))
 			return $this->_refreshSelector;
 		return "#".$this->identifier." tbody";
 	}
@@ -389,9 +389,9 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\Widget::show()
 	 */
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
-			if(\is_array(array_values($modelInstance)[0]))
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
+			if (\is_array(array_values($modelInstance)[0]))
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -426,24 +426,24 @@ 
 		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;
 	}
 }
\ No newline at end of file

Ajax/common/Widget.php

Spacing +80 added lines, -80 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\html\modules\HtmlModal;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait;
+	use FieldAsTrait, FormTrait;
 
 	/**
 	 * @var string classname
@@ -53,17 +53,17 @@ 
 	protected $_generated;
 
 
-	public function __construct($identifier,$model,$modelInstance=NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
-		if(isset($modelInstance)){
+		if (isset($modelInstance)) {
 			$this->show($modelInstance);
 		}
 		$this->_generated=false;
 	}
 
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
 		$this->_instanceViewer=$instanceViewer;
 		$this->content=[$contentKey=>$content];
 		$this->_self=$content;
@@ -75,31 +75,31 @@ 
 	 * @param int|string $fieldName
 	 * @return int|string
 	 */
-	protected function _getIndex($fieldName){
+	protected function _getIndex($fieldName) {
 		$index=$fieldName;
-		if(\is_string($fieldName)){
+		if (\is_string($fieldName)) {
 			$fields=$this->_instanceViewer->getVisibleProperties();
 			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix,$name=""){
+	protected function _getFieldIdentifier($prefix, $name="") {
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
-	protected function _getFieldName($index){
+	protected function _getFieldName($index) {
 		return $this->_instanceViewer->getFieldName($index);
 	}
 
-	protected function _getFieldCaption($index){
+	protected function _getFieldCaption($index) {
 		return $this->_instanceViewer->getCaption($index);
 	}
 
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
 
-	public function show($modelInstance){
-		if(\is_array($modelInstance)){
+	public function show($modelInstance) {
+		if (\is_array($modelInstance)) {
 			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
 		$this->_modelInstance=$modelInstance;
@@ -125,7 +125,7 @@ 
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -136,66 +136,66 @@ 
 	 * @param callable $callback function called after the field compilation
 	 * @return Widget
 	 */
-	public function afterCompile($index,$callback){
+	public function afterCompile($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->afterCompile($index, $callback);
 		return $this;
 	}
 
-	public function setColor($color){
+	public function setColor($color) {
 		return $this->getHtmlComponent()->setColor($color);
 	}
 
 
-	public function setCaptions($captions){
+	public function setCaptions($captions) {
 		$this->_instanceViewer->setCaptions($captions);
 		return $this;
 	}
 
-	public function setCaption($index,$caption){
+	public function setCaption($index, $caption) {
 		$this->_instanceViewer->setCaption($this->_getIndex($index), $caption);
 		return $this;
 	}
 
-	public function setFields($fields){
+	public function setFields($fields) {
 		$this->_instanceViewer->setVisibleProperties($fields);
 		return $this;
 	}
 
-	public function addField($field){
+	public function addField($field) {
 		$this->_instanceViewer->addField($field);
 		return $this;
 	}
 
-	public function addMessage($attributes=NULL,$fieldName="message"){
+	public function addMessage($attributes=NULL, $fieldName="message") {
 		$this->_instanceViewer->addField($fieldName);
 		$count=$this->_instanceViewer->visiblePropertiesCount();
-		return $this->fieldAsMessage($count-1,$attributes);
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
-	public function addErrorMessage(){
-		return $this->addMessage(["error"=>true],"message");
+	public function addErrorMessage() {
+		return $this->addMessage(["error"=>true], "message");
 	}
 
-	public function insertField($index,$field){
+	public function insertField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field);
 		return $this;
 	}
 
-	public function insertInField($index,$field){
+	public function insertInField($index, $field) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertInField($index, $field);
 		return $this;
 	}
 
-	public function setValueFunction($index,$callback){
+	public function setValueFunction($index, $callback) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->setValueFunction($index, $callback);
 		return $this;
 	}
 
-	public function setIdentifierFunction($callback){
+	public function setIdentifierFunction($callback) {
 		$this->_instanceViewer->setIdentifierFunction($callback);
 		return $this;
 	}
@@ -203,8 +203,8 @@ 
 	/**
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
-	public function getToolbar(){
-		if(isset($this->_toolbar)===false){
+	public function getToolbar() {
+		if (isset($this->_toolbar)===false) {
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
@@ -216,15 +216,15 @@ 
 	 * @param callable $callback function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element,$callback=NULL){
+	public function addInToolbar($element, $callback=NULL) {
 		$tb=$this->getToolbar();
-		if($element instanceof BaseWidget){
-			if($element->getIdentifier()===""){
+		if ($element instanceof BaseWidget) {
+			if ($element->getIdentifier()==="") {
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
-		if(isset($callback)){
-			if(\is_callable($callback)){
+		if (isset($callback)) {
+			if (\is_callable($callback)) {
 				$callback($element);
 			}
 		}
@@ -237,9 +237,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
-		$result=$this->addInToolbar($caption,$callback);
-		if(isset($icon))
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
+		if (isset($icon))
 			$result->addIcon($icon);
 		return $result;
 	}
@@ -249,14 +249,14 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items,$callback=NULL){
-		if(JArray::isAssociative($items)){
-			foreach ($items as $icon=>$item){
-				$this->addItemInToolbar($item,$icon,$callback);
+	public function addItemsInToolbar(array $items, $callback=NULL) {
+		if (JArray::isAssociative($items)) {
+			foreach ($items as $icon=>$item) {
+				$this->addItemInToolbar($item, $icon, $callback);
 			}
-		}else{
-			foreach ($items as $item){
-				$this->addItemInToolbar($item,null,$callback);
+		} else {
+			foreach ($items as $item) {
+				$this->addItemInToolbar($item, null, $callback);
 			}
 		}
 		return $this;
@@ -268,12 +268,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
 		$dd=$value;
 		if (\is_string($value)) {
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
 		}
-		return $this->addInToolbar($dd,$callback);
+		return $this->addInToolbar($dd, $callback);
 	}
 
 	/**
@@ -282,9 +282,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
-		return $this->addInToolbar($bt,$callback);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	/**
@@ -293,9 +293,9 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
-		return $this->addInToolbar($bts,$callback);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
+		return $this->addInToolbar($bts, $callback);
 	}
 
 	/**
@@ -305,15 +305,15 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
-		$bt=new HtmlButton("",$caption);
-		$bt->addIcon($icon,$before,$labeled);
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
+		$bt=new HtmlButton("", $caption);
+		$bt->addIcon($icon, $before, $labeled);
 		return $this->addInToolbar($bt);
 	}
 
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$button=new HtmlButton($identifier,$value,$cssStyle);
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$button=new HtmlButton($identifier, $value, $cssStyle);
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
 		return $this->addInToolbar($button);
 	}
 
@@ -343,7 +343,7 @@ 
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
 	 * @return \Ajax\common\Widget
 	 */
-	public function setDefaultValueFunction($defaultValueFunction){
+	public function setDefaultValueFunction($defaultValueFunction) {
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
 		return $this;
 	}
@@ -352,7 +352,7 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable=true){
+	public function jsDisabled($disable=true) {
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
@@ -361,12 +361,12 @@ 
 	 * @param callable $callback function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addEditButtonInToolbar($caption,$callback=NULL){
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
 		$bt->setToggle();
 		$bt->setActive($this->_edition);
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
-		return $this->addInToolbar($bt,$callback);
+		return $this->addInToolbar($bt, $callback);
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -380,35 +380,35 @@ 
 	}
 
 	public function getForm() {
-		if(!isset($this->_form)){
+		if (!isset($this->_form)) {
 			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
 	}
 
-	public function run(JsUtils $js){
+	public function run(JsUtils $js) {
 		$result=parent::run($js);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$result=$this->runForm($js);
 		}
 		return $result;
 	}
 
-	protected function runForm(JsUtils $js){
+	protected function runForm(JsUtils $js) {
 		$fields=$this->getContentInstances(HtmlFormField::class);
-		foreach ($fields as $field){
+		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
 		return $this->_form->run($js);
 	}
 
-	protected function _compileForm(){
-		if(isset($this->_form)){
+	protected function _compileForm() {
+		if (isset($this->_form)) {
 			$noValidate="";
-			if(\sizeof($this->_form->getValidationParams())>0)
+			if (\sizeof($this->_form->getValidationParams())>0)
 				$noValidate="novalidate";
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -417,32 +417,32 @@ 
 		return $this;
 	}
 
-	public function moveFieldTo($from,$to){
+	public function moveFieldTo($from, $to) {
 		return $this->_instanceViewer->moveFieldTo($from, $to);
 	}
 
-	public function swapFields($index1,$index2){
+	public function swapFields($index1, $index2) {
 		$index1=$this->_getIndex($index1);
 		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
-	public function removeField($index){
+	public function removeField($index) {
 		$index=$this->_getIndex($index);
 		$this->_instanceViewer->removeField($index);
 		return $this;
 	}
 
-	public function asModal($header=null){
-		$modal=new HtmlModal("modal-".$this->identifier,$header);
+	public function asModal($header=null) {
+		$modal=new HtmlModal("modal-".$this->identifier, $header);
 		$modal->setContent($this);
-		if(isset($this->_form)){
+		if (isset($this->_form)) {
 			$this->_form->onSuccess($modal->jsHide());
 		}
 		return $modal;
 	}
 
 	public function addToProperty($name, $value, $separator=" ") {
-		return $this->getHtmlComponent()->addToProperty($name,$value,$separator);
+		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 }
\ No newline at end of file