phpMv / phpMv-UI

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

Spacing +40 added lines, -40 removed lines

@@ -14,34 +14,34 @@ 
 	use FieldTrait;
 	protected $_container;
 	protected $_validation;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label) && $label!=="")
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label) && $label!=="")
 			$this->setLabel($label);
 		$this->setField($field);
 		$this->_validation=NULL;
 	}
 
-	public function addPointingLabel($label,$pointing=Direction::NONE){
-		$labelO=new HtmlLabel("",$label);
+	public function addPointingLabel($label, $pointing=Direction::NONE) {
+		$labelO=new HtmlLabel("", $label);
 		$labelO->setPointing($pointing);
-		$this->addContent($labelO,$pointing==="below" || $pointing==="right");
+		$this->addContent($labelO, $pointing==="below" || $pointing==="right");
 		return $labelO;
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label","");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label", "");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -49,8 +49,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -58,7 +58,7 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
@@ -66,14 +66,14 @@ 
 	 * Return the field with data
 	 * @return mixed
 	 */
-	public function getDataField(){
+	public function getDataField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -84,31 +84,31 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function setInline(){
+	public function setInline() {
 		return $this->addToProperty("class", "inline");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {
@@ -116,49 +116,49 @@ 
 		return $this;
 	}
 
-	public function setReadonly(){
+	public function setReadonly() {
 		$this->getDataField()->setProperty("readonly", "");
 	}
 
-	public function addRule($type,$prompt=NULL,$value=NULL){
+	public function addRule($type, $prompt=NULL, $value=NULL) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
-			if($type==="empty"){
-				$this->addToProperty("class","required");
+			if ($type==="empty") {
+				$this->addToProperty("class", "required");
 			}
-			$this->_validation->addRule($type,$prompt,$value);
+			$this->_validation->addRule($type, $prompt, $value);
 		}
 		return $this;
 	}
 	
-	public function setOptional($optional=true){
+	public function setOptional($optional=true) {
 		$field=$this->getDataField();
-		if(isset($field)){
-			if(!isset($this->_validation)){
+		if (isset($field)) {
+			if (!isset($this->_validation)) {
 				$this->_validation=new FieldValidation($field->getIdentifier());
 			}
 			$this->_validation->setOptional($optional);
 		}
 	}
 
-	public function addRules(array $rules){
-		foreach ($rules as $rule){
+	public function addRules(array $rules) {
+		foreach ($rules as $rule) {
 			$this->addRule($rule);
 		}
 		return $this;
 	}
 
-	public function setRules(array $rules){
+	public function setRules(array $rules) {
 		$this->_validation=null;
 		return $this->addRules($rules);
 	}
 
-	public function addIcon($icon,$direction=Direction::LEFT){
+	public function addIcon($icon, $direction=Direction::LEFT) {
 		$field=$this->getField();
-		return $field->addIcon($icon,$direction);
+		return $field->addIcon($icon, $direction);
 	}
 
 	public function getValidation() {

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

Spacing +23 added lines, -23 removed lines

@@ -20,19 +20,19 @@ 
 
 	public function __construct($identifier) {
 		parent::__construct($identifier, "tr", "");
-		$this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ];
+		$this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED];
 	}
 
 	public function setColCount($colCount) {
 		$count=$this->count();
-		for($i=$count; $i < $colCount; $i++) {
+		for ($i=$count; $i<$colCount; $i++) {
 			$item=$this->addItem(NULL);
 			$item->setTagName($this->_tdTagName);
 		}
 		return $this;
 	}
 
-	public function getColCount(){
+	public function getColCount() {
 		return $this->count();
 	}
 
@@ -52,7 +52,7 @@ 
 	/**
 	 * @return HtmlTD
 	 */
-	public function getItem($index){
+	public function getItem($index) {
 		return parent::getItem($index);
 	}
 
@@ -75,7 +75,7 @@ 
 	 * @param mixed $values
 	 */
 	public function setValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); });
 	}
 
 	/**
@@ -83,27 +83,27 @@ 
 	 * @param mixed $values
 	 */
 	public function addValues($values=array()) {
-		return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);});
+		return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); });
 	}
 
 	/**
 	 * Sets or adds values to the row cols
 	 * @param mixed $values
 	 */
-	protected function _addOrSetValues($values,$callback) {
+	protected function _addOrSetValues($values, $callback) {
 		$count=$this->count();
 		if (!\is_array($values)) {
 			$values=\array_fill(0, $count, $values);
 		} else {
-			if (JArray::isAssociative($values) === true) {
+			if (JArray::isAssociative($values)===true) {
 				$values=\array_values($values);
 			}
 		}
 		$count=\min(\sizeof($values), $count);
 
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$cell=$this->content[$i];
-			$callback($cell,$values[$i]);
+			$callback($cell, $values[$i]);
 		}
 		return $this;
 	}
@@ -124,31 +124,31 @@ 
 
 	public function mergeRow($colIndex=0) {
 		$row=$this->getItem($colIndex);
-		if(isset($row)){
+		if (isset($row)) {
 			$this->getItem($colIndex)->mergeRow();
 		}
 		return $this;
 	}
 
 	public function getColPosition($colIndex) {
-		if($this->_container->_isMerged()!==true)
+		if ($this->_container->_isMerged()!==true)
 			return $colIndex;
 		$pos=0;
 		$rows=$this->_container->getContent();
-		for($i=0; $i < $this->_row; $i++) {
+		for ($i=0; $i<$this->_row; $i++) {
 			$max=\min($colIndex, $rows[$i]->count());
-			for($j=0; $j < $max; $j++) {
+			for ($j=0; $j<$max; $j++) {
 				$rowspan=$rows[$i]->getItem($j)->getRowspan();
-				if ($rowspan + $i > $this->_row)
+				if ($rowspan+$i>$this->_row)
 					$pos++;
 			}
 		}
-		if ($pos > $colIndex)
+		if ($pos>$colIndex)
 			return NULL;
 		$count=$this->count();
-		for($i=0; $i < $count; $i++) {
+		for ($i=0; $i<$count; $i++) {
 			$pos+=$this->content[$i]->getColspan();
-			if ($pos >= $colIndex + 1)
+			if ($pos>=$colIndex+1)
 				return $i;
 		}
 		return null;
@@ -156,7 +156,7 @@ 
 
 	public function conditionalCellFormat($callback, $format) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->conditionalCellFormat($callback, $format);
 		}
 		return $this;
@@ -171,8 +171,8 @@ 
 
 	public function containsStr($needle) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
-			if (\strpos($cell->getContent(), $needle) !== false)
+		foreach ($cells as $cell) {
+			if (\strpos($cell->getContent(), $needle)!==false)
 				return true;
 		}
 		return false;
@@ -185,13 +185,13 @@ 
 
 	public function applyCells($callback) {
 		$cells=$this->content;
-		foreach ( $cells as $cell ) {
+		foreach ($cells as $cell) {
 			$cell->apply($callback);
 		}
 		return $this;
 	}
 
-	public function toDelete($colIndex){
+	public function toDelete($colIndex) {
 		$this->getItem($colIndex)->toDelete();
 		return $this;
 	}

Ajax/semantic/html/content/HtmlAbsractItem.php

Spacing +28 added lines, -28 removed lines

@@ -11,7 +11,7 @@ 
 
 abstract class HtmlAbsractItem extends HtmlSemDoubleElement {
 
-	public function __construct($identifier, $baseClass,$content=NULL) {
+	public function __construct($identifier, $baseClass, $content=NULL) {
 		parent::__construct($identifier, "div", $baseClass);
 		$this->content=array();
 		$this->initContent($content);
@@ -19,76 +19,76 @@ 
 
 	abstract protected function initContent($content);
 
-	public function setIcon($icon){
+	public function setIcon($icon) {
 		$this->content["icon"]=new HtmlIcon("icon-".$this->identifier, $icon);
 	}
 
-	public function removeIcon(){
-		if(isset($this->content["icon"]))
+	public function removeIcon() {
+		if (isset($this->content["icon"]))
 			unset($this->content["icon"]);
 		return $this;
 	}
 
-	public function setImage($image){
+	public function setImage($image) {
 		$image=new HtmlImg("icon-".$this->identifier, $image);
 		$image->asAvatar();
 		$this->content["image"]=$image;
 	}
 
-	private function _getContent($key="content",$baseClass="content"){
-		if(!is_array($this->content)){
+	private function _getContent($key="content", $baseClass="content") {
+		if (!is_array($this->content)) {
 			$this->content=[$this->content];
 		}
-		if(\array_key_exists($key, $this->content)===false){
-			$this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier,"div",$baseClass);
+		if (\array_key_exists($key, $this->content)===false) {
+			$this->content[$key]=new HtmlSemDoubleElement($key."-".$this->identifier, "div", $baseClass);
 		}
 		return $this->content[$key];
 	}
 	
-	private function _getRightContent(){
-		return $this->_getContent("right-content","right floated content");
+	private function _getRightContent() {
+		return $this->_getContent("right-content", "right floated content");
 	}
 	
-	public function addContent($content,$before=false){
-		$this->_getContent("content")->addContent($content,$before);
+	public function addContent($content, $before=false) {
+		$this->_getContent("content")->addContent($content, $before);
 		return $this;
 	}
 	
-	public function addRightContent($content,$before=false){
-		$this->_getRightContent()->addContent($content,$before);
+	public function addRightContent($content, $before=false) {
+		$this->_getRightContent()->addContent($content, $before);
 		return $this;
 	}
 
-	public function setTitle($title,$description=NULL,$baseClass="title"){
-		$title=new HtmlSemDoubleElement("","div",$baseClass,$title);
+	public function setTitle($title, $description=NULL, $baseClass="title") {
+		$title=new HtmlSemDoubleElement("", "div", $baseClass, $title);
 		$content=$this->_getContent();
 		$content->addContent($title);
-		if(isset($description)){
-			$description=new HtmlSemDoubleElement("","div","description",$description);
+		if (isset($description)) {
+			$description=new HtmlSemDoubleElement("", "div", "description", $description);
 			$content->addContent($description);
 		}
 		return $this;
 	}
 
-	public function getPart($partName="header"){
-		$content=\array_merge($this->_getContent()->getContent(),array(@$this->content["icon"],@$this->content["image"]));
+	public function getPart($partName="header") {
+		$content=\array_merge($this->_getContent()->getContent(), array(@$this->content["icon"], @$this->content["image"]));
 		return $this->getElementByPropertyValue("class", $partName, $content);
 	}
 
-	public function setActive($value=true){
-		if($value){
+	public function setActive($value=true) {
+		if ($value) {
 			$this->setTagName("div");
 			$this->removeProperty("href");
 			$this->addToPropertyCtrl("class", "active", array("active"));
-		}else{
+		} else {
 			$this->removePropertyValue("class", "active");
 		}
 		return $this;
 	}
 
-	public function asLink($href=NULL,$part=NULL){
+	public function asLink($href=NULL, $part=NULL) {
 		$this->setTagName("a");
-		if(isset($href))
+		if (isset($href))
 			$this->setProperty("href", $href);
 		return $this;
 	}
@@ -100,8 +100,8 @@ 
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\is_array($this->content) && JArray::isAssociative($this->content))
-			$this->content=JArray::sortAssociative($this->content, [ "right-content","icon","image","content" ]);
+		if (\is_array($this->content) && JArray::isAssociative($this->content))
+			$this->content=JArray::sortAssociative($this->content, ["right-content", "icon", "image", "content"]);
 		return parent::compile($js, $view);
 	}
 }

Ajax/semantic/traits/SemanticWidgetsTrait.php

Spacing +16 added lines, -16 removed lines

@@ -19,8 +19,8 @@ 
 	 * @param array $instances
 	 * @return DataTable
 	 */
-	public function dataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new DataTable($identifier,$model,$instances));
+	public function dataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new DataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -29,8 +29,8 @@ 
 	 * @param array $instances
 	 * @return JsonDataTable
 	 */
-	public function jsonDataTable($identifier,$model, $instances=null){
-		return $this->addHtmlComponent(new JsonDataTable($identifier,$model,$instances));
+	public function jsonDataTable($identifier, $model, $instances=null) {
+		return $this->addHtmlComponent(new JsonDataTable($identifier, $model, $instances));
 	}
 
 	/**
@@ -38,8 +38,8 @@ 
 	 * @param object $instance
 	 * @return DataElement
 	 */
-	public function dataElement($identifier, $instance=null){
-		return $this->addHtmlComponent(new DataElement($identifier,$instance));
+	public function dataElement($identifier, $instance=null) {
+		return $this->addHtmlComponent(new DataElement($identifier, $instance));
 	}
 
 	/**
@@ -47,8 +47,8 @@ 
 	 * @param object $instance
 	 * @return DataForm
 	 */
-	public function dataForm($identifier, $instance){
-		return $this->addHtmlComponent(new DataForm($identifier,$instance));
+	public function dataForm($identifier, $instance) {
+		return $this->addHtmlComponent(new DataForm($identifier, $instance));
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function defaultLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::regular($identifier,$instance));
+	public function defaultLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::regular($identifier, $instance));
 	}
 
 	/**
@@ -65,8 +65,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function smallLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::small($identifier,$instance));
+	public function smallLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::small($identifier, $instance));
 	}
 
 	/**
@@ -74,8 +74,8 @@ 
 	 * @param object $instance
 	 * @return FormLogin
 	 */
-	public function segmentedLogin($identifier,$instance=null){
-		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier,$instance));
+	public function segmentedLogin($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormLogin::attachedSegment($identifier, $instance));
 	}
 
 	/**
@@ -83,7 +83,7 @@ 
 	 * @param object $instance
 	 * @return FormAccount
 	 */
-	public function defaultAccount($identifier,$instance=null){
-		return $this->addHtmlComponent(FormAccount::regular($identifier,$instance));
+	public function defaultAccount($identifier, $instance=null) {
+		return $this->addHtmlComponent(FormAccount::regular($identifier, $instance));
 	}
 }

Ajax/semantic/widgets/datatable/JsonDataTable.php

Spacing +32 added lines, -32 removed lines

@@ -22,25 +22,25 @@ 
 		$this->_rowClass="_json _element";
 	}
 
-	protected function _generateContent($table){
+	protected function _generateContent($table) {
 		$this->_addRowModel($table);
 		parent::_generateContent($table);
 	}
 
-	protected function _addRowModel($table){
+	protected function _addRowModel($table) {
 		$fields=$this->_instanceViewer->getSimpleProperties();
-		$row=$this->_createRow($table, $this->_modelClass,$fields);
-		$row->setProperty("style","display:none;");
+		$row=$this->_createRow($table, $this->_modelClass, $fields);
+		$row->setProperty("style", "display:none;");
 		$table->getBody()->_addRow($row);
 	}
 
-	protected function _createRow($table,$rowClass,$fields){
+	protected function _createRow($table, $rowClass, $fields) {
 		$object=JReflection::jsonObject($this->_model);
-		if(isset($this->_rowModelCallback)){
+		if (isset($this->_rowModelCallback)) {
 			$callback=$this->_rowModelCallback;
 			$callback($object);
 		}
-		$row=$this->_generateRow($object, $fields,$table,"_jsonArrayChecked");
+		$row=$this->_generateRow($object, $fields, $table, "_jsonArrayChecked");
 		$row->setClass($rowClass." _element");
 		return $row;
 	}
@@ -49,24 +49,24 @@ 
 	 * {@inheritDoc}
 	 * @see DataTable::_associatePaginationBehavior()
 	 */
-	protected function _associatePaginationBehavior(JsUtils $js=NULL,$offset=null){
+	protected function _associatePaginationBehavior(JsUtils $js=NULL, $offset=null) {
 		$callback=null;
 		$menu=$this->_pagination->getMenu();
 		
-		if(isset($js)){
+		if (isset($js)) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.=$this->_generatePaginationScript($id);
-			if(isset($this->_urls["refresh"])){
-				if(isset($menu))
-				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a","#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			if (isset($this->_urls["refresh"])) {
+				if (isset($menu))
+				$js->jsonArrayOn("click", "#".$menu->getIdentifier()." a", "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'p':$(this).attr('data-page'),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 			}
 		}
 
 	}
 	
-	protected function _generatePaginationScript($id){
+	protected function _generatePaginationScript($id) {
 		return ";var page=parseInt($(self).attr('data-page')) || 1;var pages_visibles=$('#pagination-{$id} .item').length-2;
 			var lastPage=$('#pagination-{$id} ._lastPage');
 			var middle= Math.ceil((pages_visibles-1)/ 2);
@@ -86,16 +86,16 @@ 
 			lastPage.attr('data-page',Math.min(lastPage.attr('data-max'),page+1));
 			$('#{$id}').trigger('pageChange');$('#{$id}').trigger('activeRowChange');$('#pagination-{$id}').show();";
 	}
-	protected function _compileSearchFieldBehavior(JsUtils $js=NULL){
+	protected function _compileSearchFieldBehavior(JsUtils $js=NULL) {
 		
 	}
-	protected function _associateSearchFieldBehavior(JsUtils $js=NULL,$offset=null){
-		if(isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])){
+	protected function _associateSearchFieldBehavior(JsUtils $js=NULL, $offset=null) {
+		if (isset($this->_searchField) && isset($js) && isset($this->_urls["refresh"])) {
 			$id=$this->identifier;
 			$callback=$js->getScript($offset).$this->getHtmlComponent()->getInnerScript();
-			$callback.=$js->trigger("#".$id." [name='selection[]']","change",false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
+			$callback.=$js->trigger("#".$id." [name='selection[]']", "change", false)."$('#".$id." tbody .ui.checkbox').checkbox();".$js->execOn("change", "#".$id." [name='selection[]']", $this->_getCheckedChange($js));
 			$callback.="$('#pagination-{$id}').hide();$('#".$this->identifier."').trigger('searchTerminate',[$(self).val()]);";
-			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(),"#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"],"post",["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}","jsCallback"=>$callback]);
+			$js->jsonArrayOn("change", "#".$this->_searchField->getDataField()->getIdentifier(), "#".$this->_identifier." tr.".$this->_modelClass, $this->_urls["refresh"], "post", ["params"=>"{'s':$(self).val(),'_model':'".JString::doubleBackSlashes($this->_model)."'}", "jsCallback"=>$callback]);
 		}
 	}
 	
@@ -109,29 +109,29 @@ 
 	 * @param string $jsCallback
 	 * @return AjaxCall
 	 */
-	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		$parameters=\array_merge($parameters,["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass,"url"=>$url,"method"=>$method,"params"=>$params,"jsCallback"=>$jsCallback]);
+	public function jsJsonArray($url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		$parameters=\array_merge($parameters, ["modelSelector"=>"#".$this->_identifier." tr.".$this->_modelClass, "url"=>$url, "method"=>$method, "params"=>$params, "jsCallback"=>$jsCallback]);
 		return new AjaxCall("jsonArray", $parameters);
 	}
 
-	public function jsClear(){
+	public function jsClear() {
 		return "$('#{$this->identifier} tbody').find('._json').remove();";
 	}
 
-	public function clearOn(BaseHtml $element,$event, $stopPropagation=false, $preventDefault=false){
-		return $element->addEvent($event, $this->jsClear(),$stopPropagation,$preventDefault);
+	public function clearOn(BaseHtml $element, $event, $stopPropagation=false, $preventDefault=false) {
+		return $element->addEvent($event, $this->jsClear(), $stopPropagation, $preventDefault);
 	}
 
-	public function clearOnClick(BaseHtml $element,$stopPropagation=false, $preventDefault=false){
-		return $this->clearOn($element, "click",$stopPropagation,$preventDefault);
+	public function clearOnClick(BaseHtml $element, $stopPropagation=false, $preventDefault=false) {
+		return $this->clearOn($element, "click", $stopPropagation, $preventDefault);
 	}
 
-	public function jsonArrayOn(BaseHtml $element,$event,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $element->_addEvent($event, $this->jsJsonArray($url,$method,$params,$jsCallback,$parameters));
+	public function jsonArrayOn(BaseHtml $element, $event, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $element->_addEvent($event, $this->jsJsonArray($url, $method, $params, $jsCallback, $parameters));
 	}
 
-	public function jsonArrayOnClick(BaseHtml $element,$url, $method="get", $params="{}", $jsCallback=NULL,$parameters=[]){
-		return $this->jsonArrayOn($element, "click", $url,$method,$params,$jsCallback,$parameters);
+	public function jsonArrayOnClick(BaseHtml $element, $url, $method="get", $params="{}", $jsCallback=NULL, $parameters=[]) {
+		return $this->jsonArrayOn($element, "click", $url, $method, $params, $jsCallback, $parameters);
 	}
 
 	/**
@@ -142,8 +142,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){
-		return parent::paginate($page, $total_rowcount,$items_per_page,$pages_visibles);
+	public function paginate($page, $total_rowcount, $items_per_page=10, $pages_visibles=null) {
+		return parent::paginate($page, $total_rowcount, $items_per_page, $pages_visibles);
 	}
 
 	public function setRowModelCallback($_rowModelCallback) {

Ajax/semantic/traits/SemanticHtmlModulesTrait.php

Spacing +5 added lines, -5 removed lines

@@ -43,8 +43,8 @@ 
 	 * @param string $type
 	 * @return HtmlFormFields
 	 */
-	public function htmlRadios($identifier, $items=[], $label=NULL,$value=NULL, $type=NULL) {
-		return $this->addHtmlComponent(HtmlFormFields::radios($identifier,$items,$label,$value,$type));
+	public function htmlRadios($identifier, $items=[], $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addHtmlComponent(HtmlFormFields::radios($identifier, $items, $label, $value, $type));
 	}
 
 	/**
@@ -100,7 +100,7 @@ 
 	 * @return HtmlModal
 	 */
 	public function htmlModal($identifier, $header="", $content="", $actions=array()) {
-		return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions));
+		return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions));
 	}
 
 	/**
@@ -131,8 +131,8 @@ 
 	 * @param boolean $associative
 	 * @return HtmlDropdown
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) {
-		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative));
+	public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative));
 	}
 
 	/**

Ajax/common/html/BaseWidget.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,7 @@ 
 	 * @return mixed
 	 */
 	public function getLibraryId() {
-		if( isset($this->_libraryId)){
+		if (isset($this->_libraryId)) {
 			return $this->_libraryId;
 		}
 		return $this->identifier;
@@ -47,7 +47,7 @@ 
 	 * @param mixed $_libraryId
 	 */
 	public function setLibraryId($_libraryId) {
-		$this->_libraryId = $_libraryId;
+		$this->_libraryId=$_libraryId;
 	}
 
 }

Ajax/common/html/BaseHtml.php

Spacing +59 added lines, -59 removed lines

@@ -15,11 +15,11 @@ 
  * @version 1.3
  */
 abstract class BaseHtml extends BaseWidget {
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
 	protected $_template;
 	protected $tagName;
-	protected $_wrapBefore=array ();
-	protected $_wrapAfter=array ();
+	protected $_wrapBefore=array();
+	protected $_wrapAfter=array();
 	protected $_bsComponent;
 	protected $_compiled=false;
 	protected $_runned=false;
@@ -33,32 +33,32 @@ 
 	 */
 	abstract public function run(JsUtils $js);
 
-	private function _callSetter($setter,$key,$value,&$array){
+	private function _callSetter($setter, $key, $value, &$array) {
 		$result=false;
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
 			try {
 				$this->$setter($value);
 				unset($array[$key]);
 				$result=true;
-			} catch ( \Exception $e ) {
+			}catch (\Exception $e) {
 				$result=false;
 			}
 		}
 		return $result;
 	}
 
-	protected function getTemplate(JsUtils $js=NULL,$view=null) {
-		return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view);
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
 	}
 
 	protected function ctrl($name, $value, $typeCtrl) {
 		if (\is_array($typeCtrl)) {
-			if (array_search($value, $typeCtrl) === false) {
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
+			if (array_search($value, $typeCtrl)===false) {
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
 			}
 		} else {
 			if (!$typeCtrl($value)) {
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
 			}
 		}
 		return true;
@@ -75,7 +75,7 @@ 
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
-			$name.=$separator . $value;
+			$name.=$separator.$value;
 		}
 		return $this;
 	}
@@ -87,12 +87,12 @@ 
 		if (\is_array($typeCtrl)) {
 			$this->removeOldValues($name, $typeCtrl);
 		}
-		$name.=$separator . $value;
+		$name.=$separator.$value;
 		return $this;
 	}
 
 	protected function addToMember(&$name, $value, $separator=" ") {
-		$name=str_ireplace($value, "", $name) . $separator . $value;
+		$name=str_ireplace($value, "", $name).$separator.$value;
 		return $this;
 	}
 
@@ -103,18 +103,18 @@ 
 		$oldValue=trim($oldValue);
 	}
 
-	protected function _getElementBy($callback,$elements){
+	protected function _getElementBy($callback, $elements) {
 		if (\is_array($elements)) {
 			$elements=\array_values($elements);
 			$flag=false;
 			$index=0;
-			while ( !$flag && $index < sizeof($elements) ) {
+			while (!$flag && $index<sizeof($elements)) {
 				if ($elements[$index] instanceof BaseHtml)
 					$flag=($callback($elements[$index]));
 					$index++;
 			}
-			if ($flag === true)
-				return $elements[$index - 1];
+			if ($flag===true)
+				return $elements[$index-1];
 		} elseif ($elements instanceof BaseHtml) {
 			if ($callback($elements))
 				return $elements;
@@ -142,13 +142,13 @@ 
 	}
 
 	public function fromArray($array) {
-		foreach ( $this as $key => $value ) {
-			if(array_key_exists($key, $array)===true)
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
+		foreach ($this as $key => $value) {
+			if (array_key_exists($key, $array)===true)
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
 		}
-		foreach ( $array as $key => $value ) {
-			if($this->_callSetter($key, $key, $value, $array)===false){
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
+		foreach ($array as $key => $value) {
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
 			}
 		}
 		return $array;
@@ -156,7 +156,7 @@ 
 
 	public function fromDatabaseObjects($objects, $function) {
 		if (isset($objects)) {
-			foreach ( $objects as $object ) {
+			foreach ($objects as $object) {
 				$this->fromDatabaseObject($object, $function);
 			}
 		}
@@ -177,7 +177,7 @@ 
 
 
 	public function getElementById($identifier, $elements) {
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
 	}
 
 	public function getBsComponent() {
@@ -190,11 +190,11 @@ 
 	}
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
-		if(!$this->_compiled){
-			if(isset($js)){
+		if (!$this->_compiled) {
+			if (isset($js)) {
 				$beforeCompile=$js->getParam("beforeCompileHtml");
-				if(\is_callable($beforeCompile)){
-					$beforeCompile($this,$js,$view);
+				if (\is_callable($beforeCompile)) {
+					$beforeCompile($this, $js, $view);
 				}
 			}
 			$this->callCallback($this->_preCompile);
@@ -204,17 +204,17 @@ 
 	}
 
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		$this->compile_once($js,$view);
-		$result=$this->getTemplate($js,$view);
-		foreach ( $this as $key => $value ) {
-				if(\strstr($result, "%{$key}%")!==false){
+		$this->compile_once($js, $view);
+		$result=$this->getTemplate($js, $view);
+		foreach ($this as $key => $value) {
+				if (\strstr($result, "%{$key}%")!==false) {
 					if (\is_array($value)) {
-						$v=PropertyWrapper::wrap($value, $js,$view);
-					}elseif($value instanceof \stdClass){
-							$v=\print_r($value,true);
-					}elseif ($value instanceof BaseHtml){
-						$v=$value->compile($js,$view);
-					}else{
+						$v=PropertyWrapper::wrap($value, $js, $view);
+					}elseif ($value instanceof \stdClass) {
+							$v=\print_r($value, true);
+					}elseif ($value instanceof BaseHtml) {
+						$v=$value->compile($js, $view);
+					} else {
 						$v=$value;
 					}
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@ 
 		}
 		if (isset($js)===true) {
 			$this->run($js);
-			if (isset($view) === true) {
+			if (isset($view)===true) {
 				$js->addViewElement($this->getLibraryId(), $result, $view);
 			}
 		}
 
-		if(\is_callable($this->_postCompile)){
+		if (\is_callable($this->_postCompile)) {
 			$pc=$this->_postCompile;
 			$pc($this);
 		}
@@ -241,13 +241,13 @@ 
 	 * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"]
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function setDraggable($attr="id",$dropZone=null,$parameters=[]){
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
 		$this->setProperty("draggable", "true");
-		$this->addEvent("dragstart",Javascript::draggable($attr));
-		if(isset($dropZone)&& $dropZone instanceof BaseHtml){
-			$jqueryDone="append";$jsCallback="";
+		$this->addEvent("dragstart", Javascript::draggable($attr));
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
+			$jqueryDone="append"; $jsCallback="";
 			extract($parameters);
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
 		}
 		return $this;
 	}
@@ -259,11 +259,11 @@ 
 	 * @param array $parameters
 	 * @return \Ajax\common\html\BaseHtml
 	 */
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
 		$stopPropagation=false;
-		$this->addEvent("dragover", '', $stopPropagation,true);
+		$this->addEvent("dragover", '', $stopPropagation, true);
 		extract($parameters);
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
 		return $this;
 	}
 
@@ -271,17 +271,17 @@ 
 		return $this->compile();
 	}
 
-	public function onPostCompile($callback){
+	public function onPostCompile($callback) {
 		$this->_postCompile=$callback;
 	}
 
-	public function onPreCompile($callback){
+	public function onPreCompile($callback) {
 		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
 	}
 	
-	private function addCallback($originalValue,$callback){
-		if(isset($originalValue)){
-			if(!is_array($originalValue)){
+	private function addCallback($originalValue, $callback) {
+		if (isset($originalValue)) {
+			if (!is_array($originalValue)) {
 				$result=[$originalValue];
 			}
 			$result[]=$callback;
@@ -290,12 +290,12 @@ 
 		return $callback;
 	}
 	
-	private function callCallback($callable){
-		if(\is_callable($callable)){
+	private function callCallback($callable) {
+		if (\is_callable($callable)) {
 			return $callable($this);
 		}
-		if(is_array($callable)){
-			foreach ($callable as $call){
+		if (is_array($callable)) {
+			foreach ($callable as $call) {
 				$this->callCallback($call);
 			}
 		}

Ajax/common/html/HtmlDoubleElement.php

Spacing +28 added lines, -28 removed lines

@@ -30,15 +30,15 @@ 
 		return $this->content;
 	}
 
-	public function addContent($content,$before=false) {
+	public function addContent($content, $before=false) {
 		if (!\is_array($this->content)) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
+			if (isset($this->content))
+				$this->content=array($this->content);
 			else
 				$this->content=array();
 		}
-		if($before)
-			array_unshift($this->content,$content);
+		if ($before)
+			array_unshift($this->content, $content);
 		else
 			$this->content []=$content;
 		return $this;
@@ -53,7 +53,7 @@ 
 		if ($this->content instanceof HtmlDoubleElement) {
 			$this->content->run($js);
 		} else if (\is_array($this->content)) {
-			foreach ( $this->content as $itemContent ) {
+			foreach ($this->content as $itemContent) {
 				if ($itemContent instanceof HtmlDoubleElement) {
 					$itemContent->run($js);
 				}
@@ -70,19 +70,19 @@ 
 		return $this;
 	}
 
-	public function getContentInstances($class){
-		return $this->_getContentInstances($class,$this->content);
+	public function getContentInstances($class) {
+		return $this->_getContentInstances($class, $this->content);
 	}
 
-	protected function _getContentInstances($class,$content){
+	protected function _getContentInstances($class, $content) {
 		$instances=[];
-		if($content instanceof $class){
+		if ($content instanceof $class) {
 			$instances[]=$content;
-		}elseif($content instanceof HtmlDoubleElement){
-			$instances=\array_merge($instances,$content->getContentInstances($class));
-		}elseif (\is_array($content)){
-			foreach ($content as $element){
-				$instances=\array_merge($instances,$this->_getContentInstances($class, $element));
+		}elseif ($content instanceof HtmlDoubleElement) {
+			$instances=\array_merge($instances, $content->getContentInstances($class));
+		}elseif (\is_array($content)) {
+			foreach ($content as $element) {
+				$instances=\array_merge($instances, $this->_getContentInstances($class, $element));
 			}
 		}
 		return $instances;
@@ -92,36 +92,36 @@ 
 	 * Transforms the element into a link
 	 * @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))
+		if (isset($target))
 			$this->setProperty("target", $target);
 		return $this->setTagName("a");
 	}
 	
-	public function getTextContent(){
-		if(is_array($this->content)){
+	public function getTextContent() {
+		if (is_array($this->content)) {
 			return strip_tags(implode("", $this->content));
 		}
 		return strip_tags($this->content);
 	}
 	
-	public function asEditable(HtmlFormField $field,$asForm=false,$setValueProperty="val()"){
+	public function asEditable(HtmlFormField $field, $asForm=false, $setValueProperty="val()") {
 		$idF=$field->getIdentifier();
 		$idE=$idF;
-		if($asForm){
+		if ($asForm) {
 			$frm=new HtmlForm("frm-".$field->getIdentifier());
 			$frm->setProperty("onsubmit", "return false;");
 			$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');");
+			$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{
+		} 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');}});";
@@ -134,11 +134,11 @@ 
 	 * {@inheritDoc}
 	 * @see \Ajax\common\html\BaseHtml::compile_once()
 	 */
-	protected function compile_once(\Ajax\JsUtils $js = NULL, &$view = NULL) {
-		if(!$this->_compiled && isset($this->_editableContent)){
-			$this->wrap("",$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);
+		parent::compile_once($js, $view);
 		
 	}