phpMv / phpMv-UI

Ajax/service/Javascript.php

Spacing +17 added lines, -17 removed lines

@@ -3,28 +3,28 @@ 
 
 class Javascript {
 
-	public static $preventDefault = "\nif(event && event.preventDefault) event.preventDefault();\n";
+	public static $preventDefault="\nif(event && event.preventDefault) event.preventDefault();\n";
 
-	public static $stopPropagation = "\nif(event && event.stopPropagation) event.stopPropagation();\n";
+	public static $stopPropagation="\nif(event && event.stopPropagation) event.stopPropagation();\n";
 
-	public static function draggable($attr = "id") {
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("' . $attr . '")}));';
+	public static function draggable($attr="id") {
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;dt.setData("text/plain",JSON.stringify({id:$(event.target).attr("id"),data:$(event.target).attr("'.$attr.'")}));';
 	}
 
-	public static function dropZone($jqueryDone, $jsCallback = "") {
-		$done = ($jqueryDone != null) ? '$(event.target).' . $jqueryDone . '($("#"+_data.id));' : '';
-		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));' . $done . 'var data=_data.data;' . $jsCallback;
+	public static function dropZone($jqueryDone, $jsCallback="") {
+		$done=($jqueryDone!=null) ? '$(event.target).'.$jqueryDone.'($("#"+_data.id));' : '';
+		return 'var dt=event.dataTransfer || event.originalEvent.dataTransfer;var _data=JSON.parse(dt.getData("text/plain"));'.$done.'var data=_data.data;'.$jsCallback;
 	}
 
 	public static function containsCode($expression) {
-		return strrpos($expression, 'this') !== false || strrpos($expression, 'event') !== false || strrpos($expression, 'self') !== false;
+		return strrpos($expression, 'this')!==false || strrpos($expression, 'event')!==false || strrpos($expression, 'self')!==false;
 	}
 
 	public static function isFunction($jsCode) {
 		return JString::startswith($jsCode, "function");
 	}
 
-	public static function fileUploadBehavior($id = '') {
+	public static function fileUploadBehavior($id='') {
 		return "$('input:text, .ui.button', '#{$id}').on('click', function (e) {e.preventDefault();\$('input:file', '#{$id}').click();});
 				$('input:file', '#{$id}').on('change', function (e) {if(e.target.files.length){var name = e.target.files[0].name;$('input:text', $(e.target).parent()).val(name);}});";
 	}
@@ -38,8 +38,8 @@ 
 	 * @return string
 	 */
 	public static function prep_element($element) {
-		if (self::containsCode($element) === false) {
-			$element = '"' . addslashes($element) . '"';
+		if (self::containsCode($element)===false) {
+			$element='"'.addslashes($element).'"';
 		}
 		return $element;
 	}
@@ -54,24 +54,24 @@ 
 	 */
 	public static function prep_value($value) {
 		if (\is_array($value)) {
-			$value = implode(",", $value);
+			$value=implode(",", $value);
 		}
-		if (self::containsCode($value) === false) {
-			$value = \str_replace([
+		if (self::containsCode($value)===false) {
+			$value=\str_replace([
 				"\\",
 				"\""
 			], [
 				"\\\\",
 				"\\\""
 			], $value);
-			$value = '"' . $value . '"';
+			$value='"'.$value.'"';
 		}
 		return trim($value, "%");
 	}
 
 	public static function prep_jquery_selector($value) {
-		if (JString::startswith($value, '$(') === false) {
-			return '$(' . self::prep_value($value) . ')';
+		if (JString::startswith($value, '$(')===false) {
+			return '$('.self::prep_value($value).')';
 		}
 		return $value;
 	}

Ajax/service/AjaxCall.php

Spacing +23 added lines, -23 removed lines

@@ -10,50 +10,50 @@ 
 	private $parameters;
 
 	public function __construct($method, $parameters) {
-		$this->method = $method;
-		$this->parameters = $parameters;
+		$this->method=$method;
+		$this->parameters=$parameters;
 	}
 
-	public function compile(JsUtils $js = null) {
-		if ($js === null)
+	public function compile(JsUtils $js=null) {
+		if ($js===null)
 			return;
-		$params = "{}";
-		$stopPropagation = true;
-		$preventDefault = true;
-		$method = "get";
-		$this->parameters["immediatly"] = false;
+		$params="{}";
+		$stopPropagation=true;
+		$preventDefault=true;
+		$method="get";
+		$this->parameters["immediatly"]=false;
 		extract($this->parameters);
-		$result = $this->_eventPreparing($preventDefault, $stopPropagation);
+		$result=$this->_eventPreparing($preventDefault, $stopPropagation);
 		switch ($this->method) {
 			case "get":
-				$result .= $js->getDeferred($url, $responseElement, $this->parameters);
+				$result.=$js->getDeferred($url, $responseElement, $this->parameters);
 				break;
 			case "post":
-				$result .= $js->postDeferred($url, $params, $responseElement, $this->parameters);
+				$result.=$js->postDeferred($url, $params, $responseElement, $this->parameters);
 				break;
 			case "postForm":
-				$result .= $js->postFormDeferred($url, $form, $responseElement, $this->parameters);
+				$result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters);
 				break;
 			case "json":
-				$result .= $js->jsonDeferred($url, $method, $this->parameters);
+				$result.=$js->jsonDeferred($url, $method, $this->parameters);
 				break;
 			case "jsonArray":
-				$result .= $js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
+				$result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters);
 				break;
 			default:
-				$result .= $js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
+				$result.=$js->ajaxDeferred($this->method, $url, $responseElement, $this->parameters);
 				break;
 		}
 		return $result;
 	}
 
 	protected function _eventPreparing($preventDefault, $stopPropagation) {
-		$result = "";
-		if ($preventDefault === true) {
-			$result .= Javascript::$preventDefault;
+		$result="";
+		if ($preventDefault===true) {
+			$result.=Javascript::$preventDefault;
 		}
-		if ($stopPropagation === true) {
-			$result .= Javascript::$stopPropagation;
+		if ($stopPropagation===true) {
+			$result.=Javascript::$stopPropagation;
 		}
 		return $result;
 	}
@@ -63,7 +63,7 @@ 
 	}
 
 	public function setMethod($method) {
-		$this->method = $method;
+		$this->method=$method;
 		return $this;
 	}
 
@@ -72,7 +72,7 @@ 
 	}
 
 	public function setParameters($parameters) {
-		$this->parameters = $parameters;
+		$this->parameters=$parameters;
 		return $this;
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -15,8 +15,9 @@
 	}
 
 	public function compile(JsUtils $js = null) {
-		if ($js === null)
-			return;
+		if ($js === null) {
+					return;
+		}
 		$params = "{}";
 		$stopPropagation = true;
 		$preventDefault = true;

Ajax/semantic/widgets/datatable/DataTable.php

Braces +36 added lines, -24 removed lines

@@ -82,16 +82,19 @@ 
 					"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);
+			}
 			if (\is_array($this->_displayBehavior)) {
 				$this->_generateBehavior("display", $this->_displayBehavior, $js);
 			}
 			parent::run($js);
-			if (isset($this->_pagination))
-				$this->_associatePaginationBehavior($js, $offset);
+			if (isset($this->_pagination)) {
+							$this->_associatePaginationBehavior($js, $offset);
+			}
 			$this->_associateSearchFieldBehavior($js, $offset);
 			$this->_runned = true;
 		}
@@ -142,8 +145,9 @@ 
 			$table->setRowCount(0, \sizeof($captions));
 			$this->_generateHeader($table, $captions);
 
-			if (isset($this->_compileParts))
-				$table->setCompileParts($this->_compileParts);
+			if (isset($this->_compileParts)) {
+							$table->setCompileParts($this->_compileParts);
+			}
 
 			$this->_generateContent($table);
 
@@ -178,8 +182,9 @@ 
 	}
 
 	protected function _applyStyleAttributes($table) {
-		if (isset($this->_hiddenColumns))
-			$this->_hideColumns();
+		if (isset($this->_hiddenColumns)) {
+					$this->_hideColumns();
+		}
 		if (isset($this->_colWidths)) {
 			foreach ($this->_colWidths as $colIndex => $width) {
 				$table->setColWidth($colIndex, $width);
@@ -288,8 +293,9 @@ 
 			$field = $ck->getField();
 			$field->setProperty("value", $dataAjax);
 			$field->setProperty("name", "selection[]");
-			if (isset($checkedClass))
-				$field->setClass($checkedClass);
+			if (isset($checkedClass)) {
+							$field->setClass($checkedClass);
+			}
 			\array_unshift($values, $ck);
 		}
 		$result = $table->newRow();
@@ -306,8 +312,9 @@ 
 
 	protected function _generatePagination($table) {
 		if (isset($this->_toolbar)) {
-			if ($this->_toolbarPosition == PositionInTable::FOOTER)
-				$this->_toolbar->setFloated("left");
+			if ($this->_toolbarPosition == PositionInTable::FOOTER) {
+							$this->_toolbar->setFloated("left");
+			}
 		}
 		$footer = $table->getFooter();
 		$footer->mergeCol();
@@ -347,8 +354,9 @@ 
 
 	protected function _getFieldName($index) {
 		$fieldName = parent::_getFieldName($index);
-		if (\is_object($fieldName))
-			$fieldName = "field-" . $index;
+		if (\is_object($fieldName)) {
+					$fieldName = "field-" . $index;
+		}
 		return $fieldName . "[]";
 	}
 
@@ -527,8 +535,9 @@ 
 
 	protected function getTargetSelector($op) {
 		$result = $this->_targetSelector;
-		if (! isset($result[$op]))
-			$result = "#" . $this->identifier;
+		if (! isset($result[$op])) {
+					$result = "#" . $this->identifier;
+		}
 		return $result[$op];
 	}
 
@@ -551,8 +560,9 @@ 
 	}
 
 	public function getRefreshSelector() {
-		if (isset($this->_refreshSelector))
-			return $this->_refreshSelector;
+		if (isset($this->_refreshSelector)) {
+					return $this->_refreshSelector;
+		}
 		return "#" . $this->identifier . " tbody";
 	}
 
@@ -573,8 +583,9 @@ 
 	 */
 	public function show($modelInstance) {
 		if (\is_array($modelInstance)) {
-			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0]))
-				$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			if (isset($modelInstance[0]) && \is_array(array_values($modelInstance)[0])) {
+							$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			}
 		}
 		$this->_modelInstance = $modelInstance;
 	}
@@ -616,8 +627,9 @@ 
 	}
 
 	public function hideColumn($colIndex) {
-		if (! \is_array($this->_hiddenColumns))
-			$this->_hiddenColumns = [];
+		if (! \is_array($this->_hiddenColumns)) {
+					$this->_hiddenColumns = [];
+		}
 		$this->_hiddenColumns[] = $colIndex;
 		return $this;
 	}

Spacing +117 added lines, -117 removed lines

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

Ajax/semantic/widgets/base/FieldAsTrait.php

Braces +15 added lines, -11 removed lines

@@ -126,8 +126,9 @@ 
 	public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
 			$lbl = new HtmlLabel($id, $value);
-			if (isset($icon))
-				$lbl->addIcon($icon);
+			if (isset($icon)) {
+							$lbl->addIcon($icon);
+			}
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
@@ -135,8 +136,9 @@ 
 	public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) {
 			$header = new HtmlHeader($id, $niveau, $value);
-			if (isset($icon))
-				$header->asIcon($icon, $value);
+			if (isset($icon)) {
+							$header->asIcon($icon, $value);
+			}
 			return $header;
 		}, $index, $attributes, "header");
 	}
@@ -145,8 +147,9 @@ 
 		$this->setValueFunction($index, function ($img) use ($size, $circular) {
 			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
 			$image->setSize($size);
-			if ($circular)
-				$image->setCircular();
+			if ($circular) {
+							$image->setCircular();
+			}
 			return $image;
 		});
 		return $this;
@@ -251,8 +254,9 @@ 
 
 	public function fieldAsCheckbox($index, $attributes = NULL) {
 		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
+			if ($caption === null || $caption === "") {
+							$caption = "";
+			}
 			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
@@ -292,9 +296,9 @@ 
 		$i = 0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
-				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
-				else {
+				if (\is_int($type)) {
+									$this->fieldAs($i ++, $attributes, []);
+				} else {
 					$type = preg_replace('/\d/', '', $type);
 					$this->fieldAs($i ++, $type, $attributes);
 				}

Spacing +103 added lines, -103 removed lines

@@ -36,7 +36,7 @@ 
  */
 trait FieldAsTrait {
 
-	abstract protected function _getFieldIdentifier($prefix, $name = "");
+	abstract protected function _getFieldIdentifier($prefix, $name="");
 
 	abstract public function setValueFunction($index, $callback);
 
@@ -44,16 +44,16 @@ 
 
 	abstract protected function _getFieldCaption($index);
 
-	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement = NULL, $parameters = NULL);
+	abstract protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL);
 
 	/**
 	 *
 	 * @param HtmlFormField $element
 	 * @param array $attributes
 	 */
-	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance = null) {
+	protected function _applyAttributes(BaseHtml $element, &$attributes, $index, $instance=null) {
 		if (isset($attributes["jsCallback"])) {
-			$callback = $attributes["jsCallback"];
+			$callback=$attributes["jsCallback"];
 			if (\is_callable($callback)) {
 				$callback($element, $instance, $index, InstanceViewer::$index);
 			}
@@ -64,15 +64,15 @@ 
 		$element->fromArray($attributes);
 	}
 
-	private function _getLabelField($caption, $icon = NULL) {
-		$label = new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
+	private function _getLabelField($caption, $icon=NULL) {
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
 		return $label;
 	}
 
 	protected function _addRules(HtmlFormField $element, &$attributes) {
 		if (isset($attributes["rules"])) {
-			$this->_hasRules = true;
-			$rules = $attributes["rules"];
+			$this->_hasRules=true;
+			$rules=$attributes["rules"];
 			if (\is_array($rules)) {
 				$element->addRules($rules);
 			} else {
@@ -88,62 +88,62 @@ 
 		return $field;
 	}
 
-	protected function _fieldAs($elementCallback, &$index, $attributes = NULL, $prefix = null) {
-		$this->setValueFunction($index, function ($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
-			$caption = $this->_getFieldCaption($index);
-			$name = $this->_getFieldName($index);
-			$id = $this->_getFieldIdentifier($prefix, $name);
+	protected function _fieldAs($elementCallback, &$index, $attributes=NULL, $prefix=null) {
+		$this->setValueFunction($index, function($value, $instance, $index, $rowIndex) use (&$attributes, $elementCallback, $prefix) {
+			$caption=$this->_getFieldCaption($index);
+			$name=$this->_getFieldName($index);
+			$id=$this->_getFieldIdentifier($prefix, $name);
 			if (isset($attributes["name"])) {
-				$name = $attributes["name"];
+				$name=$attributes["name"];
 				unset($attributes["name"]);
 			}
-			$element = $elementCallback($id, $name, $value, $caption);
+			$element=$elementCallback($id, $name, $value, $caption);
 			if (\is_array($attributes)) {
 				$this->_applyAttributes($element, $attributes, $index, $instance);
 			}
-			$element->setDisabled(! $this->_edition);
+			$element->setDisabled(!$this->_edition);
 			return $element;
 		});
 		return $this;
 	}
 
-	public function fieldAsProgress($index, $label = NULL, $attributes = array()) {
-		$this->setValueFunction($index, function ($value) use ($label, $attributes) {
-			$pb = new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
+		$this->setValueFunction($index, function($value) use ($label, $attributes) {
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
 			return $pb;
 		});
 		return $this;
 	}
 
-	public function fieldAsRating($index, $max = 5, $icon = "") {
-		$this->setValueFunction($index, function ($value) use ($max, $icon) {
-			$rating = new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
+	public function fieldAsRating($index, $max=5, $icon="") {
+		$this->setValueFunction($index, function($value) use ($max, $icon) {
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
 			return $rating;
 		});
 		return $this;
 	}
 
-	public function fieldAsLabel($index, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($icon) {
-			$lbl = new HtmlLabel($id, $value);
+	public function fieldAsLabel($index, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($icon) {
+			$lbl=new HtmlLabel($id, $value);
 			if (isset($icon))
 				$lbl->addIcon($icon);
 			return $lbl;
 		}, $index, $attributes, "label");
 	}
 
-	public function fieldAsHeader($index, $niveau = 1, $icon = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($niveau, $icon) {
-			$header = new HtmlHeader($id, $niveau, $value);
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($niveau, $icon) {
+			$header=new HtmlHeader($id, $niveau, $value);
 			if (isset($icon))
 				$header->asIcon($icon, $value);
 			return $header;
 		}, $index, $attributes, "header");
 	}
 
-	public function fieldAsImage($index, $size = Size::MINI, $circular = false) {
-		$this->setValueFunction($index, function ($img) use ($size, $circular) {
-			$image = new HtmlImage($this->_getFieldIdentifier("image"), $img);
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
+		$this->setValueFunction($index, function($img) use ($size, $circular) {
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img);
 			$image->setSize($size);
 			if ($circular)
 				$image->setCircular();
@@ -153,65 +153,65 @@ 
 	}
 
 	public function fieldAsFlag($index) {
-		$this->setValueFunction($index, function ($flag) {
-			$flag = new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
+		$this->setValueFunction($index, function($flag) {
+			$flag=new HtmlFlag($this->_getFieldIdentifier("flag"), $flag);
 			return $flag;
 		});
 		return $this;
 	}
 
 	public function fieldAsIcon($index) {
-		$this->setValueFunction($index, function ($icon) {
-			$icon = new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
+		$this->setValueFunction($index, function($icon) {
+			$icon=new HtmlIcon($this->_getFieldIdentifier("icon"), $icon);
 			return $icon;
 		});
 		return $this;
 	}
 
-	public function fieldAsAvatar($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) {
-			$img = new HtmlImage($id, $value);
+	public function fieldAsAvatar($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) {
+			$img=new HtmlImage($id, $value);
 			$img->asAvatar();
 			return $img;
 		}, $index, $attributes, "avatar");
 	}
 
-	public function fieldAsRadio($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value) use ($attributes) {
-			$input = new HtmlFormRadio($id, $name, $value, $value);
+	public function fieldAsRadio($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value) use ($attributes) {
+			$input=new HtmlFormRadio($id, $name, $value, $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "radio");
 	}
 
-	public function fieldAsRadios($index, $elements = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements) {
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements) {
 			return HtmlFormFields::radios($name, $elements, $caption, $value);
 		}, $index, $attributes, "radios");
 	}
 
-	public function fieldAsList($index, $classNames = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($classNames) {
-			$result = new HtmlList($name, $value);
+	public function fieldAsList($index, $classNames="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($classNames) {
+			$result=new HtmlList($name, $value);
 			$result->addClass($classNames);
 			return $result;
 		}, $index, $attributes, "list");
 	}
 
-	public function fieldAsInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsLabeledInput($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, '', 'text', $value, $caption);
-			$required = '';
+	public function fieldAsLabeledInput($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, '', 'text', $value, $caption);
+			$required='';
 			if (isset($attributes['rules'])) {
-				$rules = json_encode($attributes['rules']);
-				if (strpos($rules, 'empty') !== false) {
-					$required = 'required';
+				$rules=json_encode($attributes['rules']);
+				if (strpos($rules, 'empty')!==false) {
+					$required='required';
 				}
 			}
 			$input->getField()
@@ -222,80 +222,80 @@ 
 		}, $index, $attributes, 'input');
 	}
 
-	public function fieldAsDataList($index, ?array $items = [], $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $items) {
-			$input = new HtmlFormInput($id, $caption, "text", $value);
+	public function fieldAsDataList($index, ?array $items=[], $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $items) {
+			$input=new HtmlFormInput($id, $caption, "text", $value);
 			$input->getField()
 				->addDataList($items);
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsFile($index, $attributes = NULL) {
+	public function fieldAsFile($index, $attributes=NULL) {
 		if (isset($this->_form)) {
 			$this->_form->setProperty('enctype', 'multipart/form-data');
 		}
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$input = new HtmlFormInput($id, $caption);
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$input=new HtmlFormInput($id, $caption);
 			$input->asFile();
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "input");
 	}
 
-	public function fieldAsTextarea($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			$textarea = new HtmlFormTextarea($id, $caption, $value);
+	public function fieldAsTextarea($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "textarea");
 	}
 
-	public function fieldAsElement($index, $tagName = "div", $baseClass = "", $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
-			$div = new HtmlSemDoubleElement($id, $tagName, $baseClass);
+	public function fieldAsElement($index, $tagName="div", $baseClass="", $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes, $tagName, $baseClass) {
+			$div=new HtmlSemDoubleElement($id, $tagName, $baseClass);
 			$div->setContent(\htmlentities($value));
-			$textarea = new HtmlFormField("field-" . $id, $div, $caption);
+			$textarea=new HtmlFormField("field-".$id, $div, $caption);
 			return $this->_prepareFormFields($textarea, $name, $attributes);
 		}, $index, $attributes, "element");
 	}
 
-	public function fieldAsHidden($index, $attributes = NULL) {
-		if (! \is_array($attributes)) {
-			$attributes = [];
+	public function fieldAsHidden($index, $attributes=NULL) {
+		if (!\is_array($attributes)) {
+			$attributes=[];
 		}
-		$attributes["inputType"] = "hidden";
-		$attributes["style"] = "display:none;";
+		$attributes["inputType"]="hidden";
+		$attributes["style"]="display:none;";
 		return $this->fieldAsInput($index, $attributes);
 	}
 
-	public function fieldAsCheckbox($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($attributes) {
-			if ($caption === null || $caption === "")
-				$caption = "";
-			$input = new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
+	public function fieldAsCheckbox($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes) {
+			if ($caption===null || $caption==="")
+				$caption="";
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
 			$input->setChecked(JString::isBooleanTrue($value));
 			return $this->_prepareFormFields($input, $name, $attributes);
 		}, $index, $attributes, "ck");
 	}
 
-	public function fieldAsDropDown($index, $elements = [], $multiple = false, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
-			$dd = new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements, $multiple, $attributes) {
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value ?? '');
 			$dd->asSelect($name, $multiple);
 			return $this->_prepareFormFields($dd, $name, $attributes);
 		}, $index, $attributes, "dd");
 	}
 
-	public function fieldAsMessage($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$mess = new HtmlMessage("message-" . $id, $caption);
+	public function fieldAsMessage($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$mess=new HtmlMessage("message-".$id, $caption);
 			$mess->addHeader($value);
 			return $mess;
 		}, $index, $attributes, "message");
 	}
 
-	public function fieldAsLink($index, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) {
-			$lnk = new HtmlLink("message-" . $id, "#", $caption);
+	public function fieldAsLink($index, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
+			$lnk=new HtmlLink("message-".$id, "#", $caption);
 			return $lnk;
 		}, $index, $attributes, "link");
 	}
@@ -307,28 +307,28 @@ 
 	 *        	an array or associative array $type=>$attributes
 	 */
 	public function fieldsAs(array $types) {
-		$i = 0;
+		$i=0;
 		if (JArray::isAssociative($types)) {
 			foreach ($types as $type => $attributes) {
 				if (\is_int($type))
-					$this->fieldAs($i ++, $attributes, []);
+					$this->fieldAs($i++, $attributes, []);
 				else {
-					$type = preg_replace('/\d/', '', $type);
-					$this->fieldAs($i ++, $type, $attributes);
+					$type=preg_replace('/\d/', '', $type);
+					$this->fieldAs($i++, $type, $attributes);
 				}
 			}
 		} else {
 			foreach ($types as $type) {
-				$this->fieldAs($i ++, $type);
+				$this->fieldAs($i++, $type);
 			}
 		}
 	}
 
-	public function fieldAs($index, $type, $attributes = NULL) {
-		$method = "fieldAs" . \ucfirst($type);
+	public function fieldAs($index, $type, $attributes=NULL) {
+		$method="fieldAs".\ucfirst($type);
 		if (\method_exists($this, $method)) {
-			if (! \is_array($attributes)) {
-				$attributes = [
+			if (!\is_array($attributes)) {
+				$attributes=[
 					$index
 				];
 			} else {
@@ -341,17 +341,17 @@ 
 		}
 	}
 
-	public function fieldAsSubmit($index, $cssStyle = NULL, $url = NULL, $responseElement = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
-			$button = new HtmlButton($id, $caption, $cssStyle);
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes) {
+			$button=new HtmlButton($id, $caption, $cssStyle);
 			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
 			return $button;
 		}, $index, $attributes, "submit");
 	}
 
-	public function fieldAsButton($index, $cssStyle = NULL, $attributes = NULL) {
-		return $this->_fieldAs(function ($id, $name, $value, $caption) use ($cssStyle) {
-			$button = new HtmlButton($id, $value, $cssStyle);
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle) {
+			$button=new HtmlButton($id, $value, $cssStyle);
 			return $button;
 		}, $index, $attributes, "button");
 	}

Ajax/common/traits/JsUtilsActionsTrait.php

Braces +36 added lines, -24 removed lines

@@ -34,8 +34,9 @@ 
 			$callback = ", function(){\n{$callback}\n}";
 		}
 		$str = "$({$element}).{$action}({$speed}{$callback});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -73,10 +74,12 @@ 
 		if (isset ( $param )) {
 			$param = Javascript::prep_value ( $param );
 			$str = "$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str = "$({$element}).{$jQueryCall}();";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).{$jQueryCall}();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -94,8 +97,9 @@ 
 		$to = Javascript::prep_element ( $to );
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -153,10 +157,12 @@ 
 		if (isset ( $value )) {
 			$value = Javascript::prep_value ( $value );
 			$str = "$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		} else {
+					$str = "$({$element}).attr(\"$attributeName\");";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -219,8 +225,9 @@ 
 
 		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -410,8 +417,9 @@ 
 		$element = Javascript::prep_element ( $element );
 		$str = "$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -481,8 +489,9 @@ 
 			$str .= "else{" . $jsCodeIfFalse . "}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $str;
+		}
 		return $str;
 	}
 
@@ -500,11 +509,13 @@ 
 	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
 		$param = Javascript::prep_value ( $param );
 		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback != "") {
+					$callback = ", function(event){\n{$jsCallback}\n}";
+		}
 		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}
 
@@ -591,8 +602,9 @@ 
 	 */
 	public function exec($js, $immediatly = false) {
 		$script = $js . "\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile [] = $script;
+		}
 		return $script;
 	}
 

Spacing +180 added lines, -180 removed lines

@@ -12,7 +12,7 @@ 
  */
 trait JsUtilsActionsTrait {
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
 	/**
 	 * show or hide with effect
@@ -28,15 +28,15 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	protected function _showHideWithEffect($action, $element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
-		if ($callback != '') {
-			$callback = ", function(){\n{$callback}\n}";
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
+		if ($callback!='') {
+			$callback=", function(){\n{$callback}\n}";
 		}
-		$str = "$({$element}).{$action}({$speed}{$callback});";
+		$str="$({$element}).{$action}({$speed}{$callback});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -47,14 +47,14 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array ( $speed, array (
+		if (in_array($speed, array(
 				'slow',
 				'normal',
 				'fast'
-		) )) {
-			$speed = '"' . $speed . '"';
-		} elseif (preg_match ( "/[^0-9]/", $speed )) {
-			$speed = '';
+		))) {
+			$speed='"'.$speed.'"';
+		} elseif (preg_match("/[^0-9]/", $speed)) {
+			$speed='';
 		}
 
 		return $speed;
@@ -69,15 +69,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function _genericCallValue($jQueryCall, $element = 'this', $param = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $param )) {
-			$param = Javascript::prep_value ( $param );
-			$str = "$({$element}).{$jQueryCall}({$param});";
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($param)) {
+			$param=Javascript::prep_value($param);
+			$str="$({$element}).{$jQueryCall}({$param});";
 		} else
-			$str = "$({$element}).{$jQueryCall}();";
+			$str="$({$element}).{$jQueryCall}();";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -91,12 +91,12 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall, $to = 'this', $element = '', $immediatly = false) {
-		$to = Javascript::prep_element ( $to );
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$to}).{$jQueryCall}({$element});";
+	public function _genericCallElement($jQueryCall, $to='this', $element='', $immediatly=false) {
+		$to=Javascript::prep_element($to);
+		$element=Javascript::prep_element($element);
+		$str="$({$to}).{$jQueryCall}({$element});";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -110,8 +110,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function addClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'addClass', $element, $class, $immediatly );
+	public function addClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -123,8 +123,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'after', $to, $element, $immediatly );
+	public function after($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'before', $to, $element, $immediatly );
+	public function before($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -149,15 +149,15 @@ 
 	 * @param boolean $immediatly
 	 *        	delayed if false
 	 */
-	public function attr($element = 'this', $attributeName = 'id', $value = "", $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		if (isset ( $value )) {
-			$value = Javascript::prep_value ( $value );
-			$str = "$({$element}).attr(\"$attributeName\",{$value});";
+	public function attr($element='this', $attributeName='id', $value="", $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		if (isset ($value)) {
+			$value=Javascript::prep_value($value);
+			$str="$({$element}).attr(\"$attributeName\",{$value});";
 		} else
-			$str = "$({$element}).attr(\"$attributeName\");";
+			$str="$({$element}).attr(\"$attributeName\");";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -169,8 +169,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function val($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'val', $element, $value, $immediatly );
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -181,8 +181,8 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function html($element = 'this', $value = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'html', $element, $value, $immediatly );
+	public function html($element='this', $value='', $immediatly=false) {
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -198,30 +198,30 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function animate($element = 'this', $params = array (), $speed = '', $extra = '', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$speed = $this->_validate_speed ( $speed );
+	public function animate($element='this', $params=array(), $speed='', $extra='', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$speed=$this->_validate_speed($speed);
 
-		$animations = "\t\t\t";
-		if (\is_array ( $params )) {
-			foreach ( $params as $param => $value ) {
-				$animations .= $param . ': \'' . $value . '\', ';
+		$animations="\t\t\t";
+		if (\is_array($params)) {
+			foreach ($params as $param => $value) {
+				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
-		$animations = substr ( $animations, 0, - 2 ); // remove the last ", "
+		$animations=substr($animations, 0, - 2); // remove the last ", "
 
-		if ($speed != '') {
-			$speed = ', ' . $speed;
+		if ($speed!='') {
+			$speed=', '.$speed;
 		}
 
-		if ($extra != '') {
-			$extra = ', ' . $extra;
+		if ($extra!='') {
+			$extra=', '.$extra;
 		}
 
-		$str = "$({$element}).animate({\n$animations\n\t\t}" . $speed . $extra . ");";
+		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -234,8 +234,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function append($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'append', $to, $element, $immediatly );
+	public function append($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -247,8 +247,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function prepend($to, $element, $immediatly = false) {
-		return $this->_genericCallElement ( 'prepend', $to, $element, $immediatly );
+	public function prepend($to, $element, $immediatly=false) {
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -264,8 +264,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeIn($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeIn", $element, $speed, $callback, $immediatly );
+	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -281,8 +281,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function fadeOut($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "fadeOut", $element, $speed, $callback, $immediatly );
+	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -298,8 +298,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideUp($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideUp", $element, $speed, $callback, $immediatly );
+	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -313,8 +313,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function removeClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'removeClass', $element, $class, $immediatly );
+	public function removeClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -330,8 +330,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideDown($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideDown", $element, $speed, $callback, $immediatly );
+	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -347,8 +347,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function slideToggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "slideToggle", $element, $speed, $callback, $immediatly );
+	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -364,8 +364,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function hide($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "hide", $element, $speed, $callback, $immediatly );
+	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -381,8 +381,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggle($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "toggle", $element, $speed, $callback, $immediatly );
+	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -395,8 +395,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function toggleClass($element = 'this', $class = '', $immediatly = false) {
-		return $this->_genericCallValue ( 'toggleClass', $element, $class, $immediatly );
+	public function toggleClass($element='this', $class='', $immediatly=false) {
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -407,12 +407,12 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function trigger($element = 'this', $event = 'click', $immediatly = false) {
-		$element = Javascript::prep_element ( $element );
-		$str = "$({$element}).trigger(\"$event\");";
+	public function trigger($element='this', $event='click', $immediatly=false) {
+		$element=Javascript::prep_element($element);
+		$str="$({$element}).trigger(\"$event\");";
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -429,8 +429,8 @@ 
 	 *        	defers the execution if set to false
 	 * @return string
 	 */
-	public function show($element = 'this', $speed = '', $callback = '', $immediatly = false) {
-		return $this->_showHideWithEffect ( "show", $element, $speed, $callback, $immediatly );
+	public function show($element='this', $speed='', $callback='', $immediatly=false) {
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
 	}
 
 	/**
@@ -440,18 +440,18 @@ 
 	 * @param array $options
 	 * @return string
 	 */
-	public function sortable($element, $options = array ()) {
-		if (count ( $options ) > 0) {
-			$sort_options = array ();
-			foreach ( $options as $k => $v ) {
-				$sort_options [] = "\n\t\t" . $k . ': ' . $v . "";
+	public function sortable($element, $options=array()) {
+		if (count($options)>0) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
+				$sort_options []="\n\t\t".$k.': '.$v."";
 			}
-			$sort_options = implode ( ",", $sort_options );
+			$sort_options=implode(",", $sort_options);
 		} else {
-			$sort_options = '';
+			$sort_options='';
 		}
 
-		return "$(" . Javascript::prep_element ( $element ) . ").sortable({" . $sort_options . "\n\t});";
+		return "$(".Javascript::prep_element($element).").sortable({".$sort_options."\n\t});";
 	}
 
 	/**
@@ -463,8 +463,8 @@ 
 	 *        	plugin location
 	 * @return string
 	 */
-	public function tablesorter($table = '', $options = '') {
-		$this->jquery_code_for_compile [] = "\t$(" . Javascript::prep_element ( $table ) . ").tablesorter($options);\n";
+	public function tablesorter($table='', $options='') {
+		$this->jquery_code_for_compile []="\t$(".Javascript::prep_element($table).").tablesorter($options);\n";
 	}
 
 	/**
@@ -476,14 +476,14 @@ 
 	 * @param boolean $immediatly
 	 *        	defers the execution if set to false
 	 */
-	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse = null, $immediatly = false) {
-		$str = "if(" . $condition . "){" . $jsCodeIfTrue . "}";
-		if (isset ( $jsCodeIfFalse )) {
-			$str .= "else{" . $jsCodeIfFalse . "}";
+	public function condition($condition, $jsCodeIfTrue, $jsCodeIfFalse=null, $immediatly=false) {
+		$str="if(".$condition."){".$jsCodeIfTrue."}";
+		if (isset ($jsCodeIfFalse)) {
+			$str.="else{".$jsCodeIfFalse."}";
 		}
 
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $str;
+			$this->jquery_code_for_compile []=$str;
 		return $str;
 	}
 
@@ -498,14 +498,14 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQuery($element, $jqueryCall, $param = "", $jsCallback = "", $immediatly = false) {
-		$param = Javascript::prep_value ( $param );
-		$callback = "";
-		if ($jsCallback != "")
-			$callback = ", function(event){\n{$jsCallback}\n}";
-		$script = "$(" . Javascript::prep_element ( $element ) . ")." . $jqueryCall . "(" . $param . $callback . ");\n";
+	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
+		$param=Javascript::prep_value($param);
+		$callback="";
+		if ($jsCallback!="")
+			$callback=", function(event){\n{$jsCallback}\n}";
+		$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -522,8 +522,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQuery($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, true );
+	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
 	}
 
 	/**
@@ -539,8 +539,8 @@ 
 	 *        	javascript code to execute after the jquery call
 	 * @return mixed
 	 */
-	public function doJQueryDeferred($element, $jqueryCall, $param = "", $jsCallback = "") {
-		return $this->_doJQuery ( $element, $jqueryCall, $param, $jsCallback, false );
+	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
+		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
 	}
 
 	/**
@@ -557,8 +557,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $preventDefault = false, $stopPropagation = false, $jsCallback = "", $immediatly = true) {
-		return $this->_add_event ( $element, $this->_doJQuery ( $elementToModify, $jqueryCall, $param, $jsCallback ), $event, $preventDefault, $stopPropagation, $immediatly );
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -572,13 +572,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"jsCallback"=>'',"immediatly"=>true)
 	 */
-	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param = "", $parameters = array ()) {
-		$jsCallback = "";
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		return $this->_doJQueryOn ( $event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly );
+	public function doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $parameters=array()) {
+		$jsCallback="";
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -590,10 +590,10 @@ 
 	 *        	delayed if false
 	 * @return String
 	 */
-	public function exec($js, $immediatly = false) {
-		$script = $js . "\n";
+	public function exec($js, $immediatly=false) {
+		$script=$js."\n";
 		if ($immediatly)
-			$this->jquery_code_for_compile [] = $script;
+			$this->jquery_code_for_compile []=$script;
 		return $script;
 	}
 
@@ -607,8 +607,8 @@ 
 	 * @return String
 	 */
 	public function execAtLast($js) {
-		$script = $js . "\n";
-		$this->jquery_code_for_compile_at_last [] = $script;
+		$script=$js."\n";
+		$this->jquery_code_for_compile_at_last []=$script;
 		return $script;
 	}
 
@@ -623,18 +623,18 @@ 
 	 *        	default : array("preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 * @return String
 	 */
-	public function execOn($event, $element, $js, $parameters = array ()) {
-		$stopPropagation = false;
-		$preventDefault = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, $this->exec ( $js ), $event, $preventDefault, $stopPropagation, $immediatly );
+	public function execOn($event, $element, $js, $parameters=array()) {
+		$stopPropagation=false;
+		$preventDefault=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
-	public function setJsonToElement($json, $elementClass = "_element", $immediatly = true) {
-		$retour = "var data={$json};" . "\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);" . "\n\tvar pk=data['pk'];var object=data['object'];" . "\n\tfor(var field in object){" . "\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){" . "\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){" . "\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }" . "\n\t});" . "\n}};\n";
-		$retour .= "\t$(document).trigger('jsonReady',[data]);\n";
-		return $this->exec ( $retour, $immediatly );
+	public function setJsonToElement($json, $elementClass="_element", $immediatly=true) {
+		$retour="var data={$json};"."\n\tdata=($.isPlainObject(data))?data:JSON.parse(data);"."\n\tvar pk=data['pk'];var object=data['object'];"."\n\tfor(var field in object){"."\n\tif($('[data-field='+field+']',$('._element[data-ajax='+pk+']')).length){"."\n\t\t$('[data-field='+field+']',$('._element[data-ajax='+pk+']')).each(function(){"."\n\t\t\tif($(this).is('[value]')) { $(this).val(object[field]);} else { $(this).html(object[field]); }"."\n\t});"."\n}};\n";
+		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
+		return $this->exec($retour, $immediatly);
 	}
 
 	/**
@@ -645,13 +645,13 @@ 
 	 * @param array $parameters
 	 *        	default : array("attr"=>"id","preventDefault"=>false,"stopPropagation"=>false,"immediatly"=>true)
 	 */
-	public function setDraggable($element, $parameters = [ ]) {
-		$attr = "id";
-		$preventDefault = false;
-		$stopPropagation = false;
-		$immediatly = true;
-		extract ( $parameters );
-		$script = $this->_add_event ( $element, Javascript::draggable ( $attr ), "dragstart", $preventDefault, $stopPropagation, $immediatly );
+	public function setDraggable($element, $parameters=[]) {
+		$attr="id";
+		$preventDefault=false;
+		$stopPropagation=false;
+		$immediatly=true;
+		extract($parameters);
+		$script=$this->_add_event($element, Javascript::draggable($attr), "dragstart", $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -665,13 +665,13 @@ 
 	 * @param string $jsCallback
 	 *        	the js script to call when element is dropped
 	 */
-	public function asDropZone($element, $jsCallback = "", $parameters = [ ]) {
-		$stopPropagation = false;
-		$immediatly = true;
-		$jqueryDone = "append";
-		$script = $this->_add_event ( $element, '', "dragover", true, $stopPropagation, $immediatly );
-		extract ( $parameters );
-		$script .= $this->_add_event ( $element, Javascript::dropZone ( $jqueryDone, $jsCallback ), "drop", true, $stopPropagation, $immediatly );
+	public function asDropZone($element, $jsCallback="", $parameters=[]) {
+		$stopPropagation=false;
+		$immediatly=true;
+		$jqueryDone="append";
+		$script=$this->_add_event($element, '', "dragover", true, $stopPropagation, $immediatly);
+		extract($parameters);
+		$script.=$this->_add_event($element, Javascript::dropZone($jqueryDone, $jsCallback), "drop", true, $stopPropagation, $immediatly);
 		return $script;
 	}
 
@@ -688,16 +688,16 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function interval($jsCode, $time, $globalName = null, $immediatly = true) {
-		if (! Javascript::isFunction ( $jsCode )) {
-			$jsCode = "function(){\n" . $jsCode . "\n}";
+	public function interval($jsCode, $time, $globalName=null, $immediatly=true) {
+		if (!Javascript::isFunction($jsCode)) {
+			$jsCode="function(){\n".$jsCode."\n}";
 		}
-		if (isset ( $globalName )) {
-			$script = "if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
+		if (isset ($globalName)) {
+			$script="if(window.{$globalName}){clearInterval(window.{$globalName});}\nwindow.{$globalName}=setInterval({$jsCode},{$time});";
 		} else {
-			$script = "setInterval({$jsCode},{$time});";
+			$script="setInterval({$jsCode},{$time});";
 		}
-		return $this->exec ( $script, $immediatly );
+		return $this->exec($script, $immediatly);
 	}
 
 	/**
@@ -709,8 +709,8 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function clearInterval($globalName, $immediatly = true) {
-		return $this->exec ( "if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly );
+	public function clearInterval($globalName, $immediatly=true) {
+		return $this->exec("if(window.{$globalName}){clearInterval(window.{$globalName});}", $immediatly);
 	}
 
 	/**
@@ -731,20 +731,20 @@ 
 	 *        	delayed if false
 	 * @return string
 	 */
-	public function counter($counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true, $immediatly = true) {
-		$stop = "";
+	public function counter($counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true, $immediatly=true) {
+		$stop="";
 		if ($countDown) {
-			$stop = "if (--timer < " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			$stop="if (--timer < ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 		} else {
-			if ($limit != 0) {
-				$stop = "if (++timer > " . $limit . ") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:" . $limit . "});}";
+			if ($limit!=0) {
+				$stop="if (++timer > ".$limit.") {clearInterval(interval);display.trigger({type:'counter-end',value: timer,limit:".$limit."});}";
 			}
 		}
-		$global = "";
-		if (isset ( $globalName )) {
-			$global = "\nwindow.{$globalName}=interval;";
+		$global="";
+		if (isset ($globalName)) {
+			$global="\nwindow.{$globalName}=interval;";
 		}
-		$timer = "var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
+		$timer="var startTimer=function(duration, display) {var timer = duration, days, hours, minutes, seconds;
 											var sh=function(disp,v){if(disp.is('[value]')){disp.val(v);} else {disp.html(v);};};
 											var shHide=function(v,k,kBefore){if(v==0 && display.find(k).closest('.timer').is(':visible') && (!kBefore || !display.find(kBefore).closest('.timer').is(':visible'))){display.find(k).closest('.timer').hide();}else{sh(display.find(k),v);}};
 											var pl=function(v,text){return (v>1)?v+' '+text+'s':(v>0)?v+' '+text:'';};
@@ -760,12 +760,12 @@ 
 												minutes = d0(parseInt((timer%3600) / 60, 10));
 												seconds = d0(parseInt(timer%60, 10));
 												mainSh(days,hours,minutes,seconds);
-												" . $stop . "
+												" . $stop."
     										}, 1000);
-										" . $global . "
+										" . $global."
 										}";
-		$element = '$("' . $counterSelector . '")';
-		return $this->exec ( $timer . "\nstartTimer(" . $value . "," . $element . ");", $immediatly );
+		$element='$("'.$counterSelector.'")';
+		return $this->exec($timer."\nstartTimer(".$value.",".$element.");", $immediatly);
 	}
 
 	/**
@@ -787,8 +787,8 @@ 
 	 *        	count down if true or elapse if false
 	 * @return string
 	 */
-	public function counterOn($element, $event, $counterSelector, $value = 0, $limit = 0, $globalName = null, $countDown = true) {
-		return $this->execOn ( $event, $element, $this->counter ( $counterSelector, $value, $limit, $globalName, $countDown, false ) );
+	public function counterOn($element, $event, $counterSelector, $value=0, $limit=0, $globalName=null, $countDown=true) {
+		return $this->execOn($event, $element, $this->counter($counterSelector, $value, $limit, $globalName, $countDown, false));
 	}
 
 	/**
@@ -802,8 +802,8 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function activateLink($target, $property = 'href', $href = null) {
-		return $this->execAtLast ( $this->_activateLink ( $target, $property, $href ) );
+	public function activateLink($target, $property='href', $href=null) {
+		return $this->execAtLast($this->_activateLink($target, $property, $href));
 	}
 
 	/**
@@ -817,14 +817,14 @@ 
 	 *        	the active href (if null, window.location.href is used)
 	 * @return string
 	 */
-	public function _activateLink($target, $property = 'href', $href = null) {
-		$js = '$("' . $target . ' [' . $property . ']").removeClass("active");';
-		if (isset ( $href )) {
-			$js .= 'var href="' . $href . '";';
+	public function _activateLink($target, $property='href', $href=null) {
+		$js='$("'.$target.' ['.$property.']").removeClass("active");';
+		if (isset ($href)) {
+			$js.='var href="'.$href.'";';
 		} else {
-			$js .= 'var href=window.location.href;';
+			$js.='var href=window.location.href;';
 		}
-		$js .= '$("' . $target . ' [' . $property . ']").each(function(){if(href.includes($(this).attr("' . $property . '"))) $(this).addClass("active");});';
+		$js.='$("'.$target.' ['.$property.']").each(function(){if(href.includes($(this).attr("'.$property.'"))) $(this).addClass("active");});';
 		return $js;
 	}
 }

Ajax/common/traits/JsUtilsEventsTrait.php

Spacing +48 added lines, -48 removed lines

@@ -10,7 +10,7 @@ 
  * @property array $jquery_code_for_compile
  */
 trait JsUtilsEventsTrait {
-	protected $jquery_events = [
+	protected $jquery_events=[
 			'bind',
 			'blur',
 			'change',
@@ -51,7 +51,7 @@ 
 			'unload'
 	];
 
-	abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true, $listenerOn=false);
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true, $listenerOn=false);
 
 	/**
 	 * Outputs a javascript library blur event
@@ -62,8 +62,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function blur($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'blur', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function blur($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'blur', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -78,8 +78,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler 
 	 * @return string
 	 */
-	public function change($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'change', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -96,18 +96,18 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function click($element = 'this', $js = '', $ret_false = TRUE, $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		if (! is_array ( $js )) {
-			$js = array (
+	public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		if (!is_array($js)) {
+			$js=array(
 					$js
 			);
 		}
 
 		if ($ret_false) {
-			$js [] = "return false;";
+			$js []="return false;";
 		}
 
-		return $this->_add_event ( $element, $js, 'click', $preventDefault, $stopPropagation, true, $listenerOn );
+		return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -122,8 +122,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function contextmenu($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'contextmenu', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function contextmenu($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'contextmenu', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -138,8 +138,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function dblclick($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'dblclick', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function dblclick($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'dblclick', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -151,8 +151,8 @@ 
 	 *        	code to execute
 	 * @return string
 	 */
-	public function error($element = 'this', $js = '') {
-		return $this->_add_event ( $element, $js, 'error' );
+	public function error($element='this', $js='') {
+		return $this->_add_event($element, $js, 'error');
 	}
 
 	/**
@@ -167,8 +167,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function focus($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'focus', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function focus($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'focus', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -181,9 +181,9 @@ 
 	 *        	code for mouse out
 	 * @return string
 	 */
-	public function hover($element = 'this', $over = '', $out = '') {
-		$event = "\n\t$(" . Javascript::prep_element ( $element ) . ").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
-		$this->jquery_code_for_compile [] = $event;
+	public function hover($element='this', $over='', $out='') {
+		$event="\n\t$(".Javascript::prep_element($element).").hover(\n\t\tfunction()\n\t\t{\n\t\t\t{$over}\n\t\t}, \n\t\tfunction()\n\t\t{\n\t\t\t{$out}\n\t\t});\n";
+		$this->jquery_code_for_compile []=$event;
 		return $event;
 	}
 
@@ -199,8 +199,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keydown($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keydown', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keydown($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keydown', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -215,8 +215,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keypress($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keypress', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keypress($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keypress', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -231,8 +231,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function keyup($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'keyup', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function keyup($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'keyup', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -247,8 +247,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function load($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'load', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function load($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'load', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -263,8 +263,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mousedown($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mousedown', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mousedown($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mousedown', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -279,8 +279,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseout($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseout', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseout($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseout', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -295,8 +295,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseleave($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseleave', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseleave($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseleave', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -311,8 +311,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseenter($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseenter', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseenter($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseenter', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -327,8 +327,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseover($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseover', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseover($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseover', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -343,8 +343,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function mouseup($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'mouseup', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function mouseup($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'mouseup', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	/**
@@ -359,8 +359,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function unload($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'unload', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function unload($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'unload', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	// --------------------------------------------------------------------
@@ -376,8 +376,8 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function resize($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'resize', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function resize($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'resize', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 
 	// --------------------------------------------------------------------
@@ -393,7 +393,7 @@ 
 	 * @param boolean|string $listenerOn use a selector for a delegated event handler
 	 * @return string
 	 */
-	public function scroll($element = 'this', $js = '', $preventDefault = false, $stopPropagation = false, $listenerOn=false) {
-		return $this->_add_event ( $element, $js, 'scroll', $preventDefault, $stopPropagation, true, $listenerOn );
+	public function scroll($element='this', $js='', $preventDefault=false, $stopPropagation=false, $listenerOn=false) {
+		return $this->_add_event($element, $js, 'scroll', $preventDefault, $stopPropagation, true, $listenerOn);
 	}
 }

Ajax/semantic/widgets/base/InstanceViewer.php

Spacing +109 added lines, -109 removed lines

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

Braces +28 added lines, -23 removed lines

@@ -35,8 +35,9 @@ 
 		$this->widgetIdentifier = $identifier;
 		$this->values = [];
 		$this->afterCompile = [];
-		if (isset($instance))
-			$this->setInstance($instance);
+		if (isset($instance)) {
+					$this->setInstance($instance);
+		}
 		$this->setCaptions($captions);
 		$this->captionCallback = NULL;
 		$this->defaultValueFunction = function ($name, $value) {
@@ -86,14 +87,16 @@ 
 	}
 
 	public function getIdentifier($index = NULL) {
-		if (! isset($index))
-			$index = self::$index;
+		if (! isset($index)) {
+					$index = self::$index;
+		}
 		$value = $index;
 		if (isset($this->values["identifier"])) {
-			if (\is_string($this->values["identifier"]))
-				$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
-			else
-				$value = $this->values["identifier"]($index, $this->instance);
+			if (\is_string($this->values["identifier"])) {
+							$value = JReflection::callMethod($this->instance, $this->values["identifier"], []);
+			} else {
+							$value = $this->values["identifier"]($index, $this->instance);
+			}
 		}
 		return $value;
 	}
@@ -124,9 +127,8 @@ 
 		} elseif (\is_callable($property) && \array_search($property, ['system','date']) === false){
 			try{
 				$value = $property($this->instance);
-			}catch(\Error $e){}
-		}
-		elseif (\is_array($property)) {
+			} catch(\Error $e){}
+		} elseif (\is_array($property)) {
 			$values = \array_map(function ($v) use ($index) {
 				return $this->_getValue($v, $index);
 			}, $property);
@@ -280,10 +282,11 @@ 
 			}
 		} elseif (\is_int($property)) {
 			$props = $this->getDefaultProperties();
-			if (isset($props[$property]))
-				$this->properties[] = $props[$property];
-			else
-				$this->properties[] = $property;
+			if (isset($props[$property])) {
+							$this->properties[] = $props[$property];
+			} else {
+							$this->properties[] = $property;
+			}
 		} else {
 			$this->properties[] = $property;
 		}
@@ -328,12 +331,13 @@ 
 		if (isset($this->captions[$index])) {
 			return $this->captions[$index];
 		}
-		if ($this->properties[$index] instanceof \ReflectionProperty)
-			return $this->properties[$index]->getName();
-		elseif (\is_callable($this->properties[$index]))
-			return "";
-		else
-			return $this->properties[$index];
+		if ($this->properties[$index] instanceof \ReflectionProperty) {
+					return $this->properties[$index]->getName();
+		} elseif (\is_callable($this->properties[$index])) {
+					return "";
+		} else {
+					return $this->properties[$index];
+		}
 	}
 
 	public function getCaptions() {
@@ -366,8 +370,9 @@ 
 	}
 
 	public function setCaption($index, $caption) {
-		if (isset($this->captions) === false)
-			$this->captions = [];
+		if (isset($this->captions) === false) {
+					$this->captions = [];
+		}
 		$this->captions[$index] = $caption;
 		return $this;
 	}

Ajax/semantic/html/modules/HtmlTab.php

Spacing +45 added lines, -45 removed lines

@@ -18,19 +18,19 @@ 
  */
 class HtmlTab extends HtmlSemCollection {
 
-	protected $params = [];
+	protected $params=[];
 
-	protected $_activated = false;
+	protected $_activated=false;
 
-	public function __construct($identifier, $tabs = array()) {
+	public function __construct($identifier, $tabs=array()) {
 		parent::__construct($identifier, "div", "");
-		$menu = new HtmlMenu("menu" . $this->identifier);
+		$menu=new HtmlMenu("menu".$this->identifier);
 		$menu->asTab(false)->setAttachment(NULL, Side::TOP);
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		$this->addItems($tabs);
 	}
 	
-	public function getMenu(){
+	public function getMenu() {
 		return $this->content['menu'];
 	}
 
@@ -41,18 +41,18 @@ 
 	 * @return HtmlSegment
 	 */
 	protected function createItem($value) {
-		$count = $this->count();
-		$title = $value;
-		$content = NULL;
+		$count=$this->count();
+		$title=$value;
+		$content=NULL;
 		if (\is_array($value)) {
-			$title = @$value[0];
-			$content = @$value[1];
+			$title=@$value[0];
+			$content=@$value[1];
 		}
-		$menuItem = $this->content["menu"]->addItem($title);
+		$menuItem=$this->content["menu"]->addItem($title);
 		$menuItem->addToProperty("data-tab", $menuItem->getIdentifier());
 		$menuItem->removeProperty("href");
-		$result = $this->createSegment($count, $content, $menuItem->getIdentifier());
-		$result->menuTab = $menuItem;
+		$result=$this->createSegment($count, $content, $menuItem->getIdentifier());
+		$result->menuTab=$menuItem;
 		return $result;
 	}
 
@@ -64,7 +64,7 @@ 
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
 	private function createSegment($count, $content, $datatab) {
-		$segment = new HtmlSegment("item-" . $this->identifier . "-" . $count, $content);
+		$segment=new HtmlSegment("item-".$this->identifier."-".$count, $content);
 		$segment->setAttachment(NULL, Side::BOTTOM)
 			->addToProperty("class", "tab")
 			->addToProperty("data-tab", $datatab);
@@ -81,10 +81,10 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabContent($index, $content) {
-		$menu = $this->content["menu"];
-		if ($index < $menu->count()) {
-			if (isset($this->content[$index]) === false) {
-				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
+		$menu=$this->content["menu"];
+		if ($index<$menu->count()) {
+			if (isset($this->content[$index])===false) {
+				$this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
 			} else
 				$this->content[$index]->setContent($content);
@@ -99,8 +99,8 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setTabsContent($contents) {
-		$size = \sizeof($contents);
-		for ($i = 0; $i < $size; $i ++) {
+		$size=\sizeof($contents);
+		for ($i=0; $i<$size; $i++) {
 			$this->setTabContent($i, $contents[$i]);
 		}
 		return $this;
@@ -113,11 +113,11 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function activate($index) {
-		$item = $this->content["menu"]->getItem($index);
-		if ($item != null) {
+		$item=$this->content["menu"]->getItem($index);
+		if ($item!=null) {
 			$item->setActive(true);
 			$this->content[$index]->setActive(true);
-			$this->_activated = true;
+			$this->_activated=true;
 		}
 		return $this;
 	}
@@ -151,9 +151,9 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->forward($initialController, $controller, $action, $params);
+			$this->content[$index]=$js->forward($initialController, $controller, $action, $params);
 			return $this->content[$index];
 		}
 
@@ -174,9 +174,9 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		if (\array_key_exists($index, $this->content)) {
-			$this->content[$index] = $js->renderContent($initialController, $viewName, $params);
+			$this->content[$index]=$js->renderContent($initialController, $viewName, $params);
 			return $this->content[$index];
 		}
 		return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params);
@@ -196,10 +196,10 @@ 
 	 * @param array $params
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params = array()) {
+	public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
 		\ob_start();
 		$js->forward($initialController, $controller, $action, $params);
-		$content = \ob_get_clean();
+		$content=\ob_get_clean();
 		return $this->addTab($title, $content);
 	}
 
@@ -215,11 +215,11 @@ 
 	 *        	The parameters to pass to the view
 	 * @return \Ajax\semantic\html\elements\HtmlSegment
 	 */
-	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params = array()) {
+	public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
 		return $this->addTab($title, $js->renderContent($initialController, $viewName, $params));
 	}
 
-	public function setPointing($value = Direction::NONE) {
+	public function setPointing($value=Direction::NONE) {
 		return $this->content["menu"]->setPointing($value);
 	}
 
@@ -254,25 +254,25 @@ 
 	 * @return \Ajax\semantic\html\modules\HtmlTab
 	 */
 	public function setMenu($menu) {
-		$contentSize = \sizeof($this->content);
-		for ($i = 0; $i < $contentSize; $i ++) {
-			if ($menu->getItem($i) !== NULL) {
+		$contentSize=\sizeof($this->content);
+		for ($i=0; $i<$contentSize; $i++) {
+			if ($menu->getItem($i)!==NULL) {
 				if (isset($this->content[$i])) {
 					$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 				}
 			}
 		}
-		$menuSize = $menu->count();
-		for ($i = 0; $i < $menuSize; $i ++) {
+		$menuSize=$menu->count();
+		for ($i=0; $i<$menuSize; $i++) {
 			$menu->getItem($i)->removeProperty("href");
-			if (isset($this->content[$i]) === false) {
-				$this->content[$i] = $this->createSegment($i, "New content", $menu->getItem($i)
+			if (isset($this->content[$i])===false) {
+				$this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)
 					->getIdentifier());
 			}
 			$menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab"));
 		}
 
-		$this->content["menu"] = $menu;
+		$this->content["menu"]=$menu;
 		return $this;
 	}
 
@@ -281,19 +281,19 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent)===false)
+			$this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params);
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
+		if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1)
 			$this->activate(0);
 		return parent::compile($js, $view);
 	}
 	
-	public function setInverted($recursive=true){
+	public function setInverted($recursive=true) {
 		parent::setInverted($recursive);
 		$this->content['menu']->addClass('inverted');
 	}

Braces +9 added lines, -6 removed lines

@@ -86,8 +86,9 @@ 
 			if (isset($this->content[$index]) === false) {
 				$this->content[$index] = $this->createSegment($index, $content, $menu->getItem($index)
 					->getIdentifier());
-			} else
-				$this->content[$index]->setContent($content);
+			} else {
+							$this->content[$index]->setContent($content);
+			}
 		}
 		return $this;
 	}
@@ -281,15 +282,17 @@ 
 	 * @see BaseHtml::run()
 	 */
 	public function run(JsUtils $js) {
-		if (isset($this->_bsComponent) === false)
-			$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		if (isset($this->_bsComponent) === false) {
+					$this->_bsComponent = $js->semantic()->tab("#" . $this->identifier . " .item", $this->params);
+		}
 		$this->addEventsOnRun($js);
 		return $this->_bsComponent;
 	}
 
 	public function compile(JsUtils $js = NULL, &$view = NULL) {
-		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1)
-			$this->activate(0);
+		if (! $this->_activated && $this->content["menu"]->count() > 0 && \sizeof($this->content) > 1) {
+					$this->activate(0);
+		}
 		return parent::compile($js, $view);
 	}
 	

Ajax/common/Widget.php

Spacing +75 added lines, -75 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\common\html\traits\BaseHooksTrait;
 
 abstract class Widget extends HtmlDoubleElement {
-	use FieldAsTrait,FormTrait,BaseHooksTrait;
+	use FieldAsTrait, FormTrait, BaseHooksTrait;
 
 	/**
 	 *
@@ -66,24 +66,24 @@ 
 
 	protected $_hasRules;
 
-	public function __construct($identifier, $model, $modelInstance = NULL) {
+	public function __construct($identifier, $model, $modelInstance=NULL) {
 		parent::__construct($identifier);
-		$this->_template = "%wrapContentBefore%%content%%wrapContentAfter%";
+		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
 		$this->setModel($model);
 		if (isset($modelInstance)) {
 			$this->show($modelInstance);
 		}
-		$this->_generated = false;
+		$this->_generated=false;
 	}
 
 	protected function _init($instanceViewer, $contentKey, $content, $edition) {
-		$this->_instanceViewer = $instanceViewer;
-		$this->content = [
+		$this->_instanceViewer=$instanceViewer;
+		$this->content=[
 			$contentKey => $content
 		];
-		$this->_self = $content;
-		$this->_toolbarPosition = PositionInTable::BEFORETABLE;
-		$this->_edition = $edition;
+		$this->_self=$content;
+		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
+		$this->_edition=$edition;
 	}
 
 	/**
@@ -92,16 +92,16 @@ 
 	 * @return int|string|boolean
 	 */
 	protected function _getIndex($fieldName) {
-		$index = $fieldName;
+		$index=$fieldName;
 		if (\is_string($fieldName)) {
-			$fields = $this->_instanceViewer->getVisibleProperties();
-			$index = \array_search($fieldName, $fields);
+			$fields=$this->_instanceViewer->getVisibleProperties();
+			$index=\array_search($fieldName, $fields);
 		}
 		return $index;
 	}
 
-	protected function _getFieldIdentifier($prefix, $name = "") {
-		return $this->identifier . "-{$prefix}-" . $this->_instanceViewer->getIdentifier();
+	protected function _getFieldIdentifier($prefix, $name="") {
+		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
 	}
 
 	protected function _getFieldName($index) {
@@ -112,13 +112,13 @@ 
 		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)) {
-			$modelInstance = \json_decode(\json_encode($modelInstance), FALSE);
+			$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
 		}
-		$this->_modelInstance = $modelInstance;
+		$this->_modelInstance=$modelInstance;
 	}
 
 	public function getModel() {
@@ -126,7 +126,7 @@ 
 	}
 
 	public function setModel($_model) {
-		$this->_model = $_model;
+		$this->_model=$_model;
 		return $this;
 	}
 
@@ -135,13 +135,13 @@ 
 	}
 
 	public function setInstanceViewer($_instanceViewer) {
-		$this->_instanceViewer = $_instanceViewer;
+		$this->_instanceViewer=$_instanceViewer;
 		return $this;
 	}
 
 	abstract public function getHtmlComponent();
 
-	public function setAttached($value = true) {
+	public function setAttached($value=true) {
 		return $this->getHtmlComponent()->setAttached($value);
 	}
 
@@ -156,8 +156,8 @@ 
 	 * @return Widget
 	 */
 	public function afterCompile($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->afterCompile($index, $callback);
 		}
 		return $this;
@@ -182,7 +182,7 @@ 
 		return $this;
 	}
 
-	public function addField($field, $key = null) {
+	public function addField($field, $key=null) {
 		$this->_instanceViewer->addField($field, $key);
 		return $this;
 	}
@@ -196,10 +196,10 @@ 
 		return $this->_instanceViewer->visiblePropertiesCount();
 	}
 
-	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);
+		$count=$this->_instanceViewer->visiblePropertiesCount();
+		return $this->fieldAsMessage($count-1, $attributes);
 	}
 
 	public function addErrorMessage() {
@@ -208,15 +208,15 @@ 
 		], "message");
 	}
 
-	public function insertField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
+	public function insertField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
 		$this->_instanceViewer->insertField($index, $field, $key);
 		return $this;
 	}
 
-	public function insertInField($index, $field, $key = null) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+	public function insertInField($index, $field, $key=null) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->insertInField($index, $field, $key);
 		}
 		return $this;
@@ -232,8 +232,8 @@ 
 	 * @return Widget
 	 */
 	public function setValueFunction($index, $callback) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$this->_instanceViewer->setValueFunction($index, $callback);
 		}
 		return $this;
@@ -249,8 +249,8 @@ 
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
 	 */
 	public function getToolbar() {
-		if (isset($this->_toolbar) === false) {
-			$this->_toolbar = new HtmlMenu("toolbar-" . $this->identifier);
+		if (isset($this->_toolbar)===false) {
+			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
 		}
 		return $this->_toolbar;
 	}
@@ -263,11 +263,11 @@ 
 	 *        	function to call on $element
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addInToolbar($element, $callback = NULL) {
-		$tb = $this->getToolbar();
+	public function addInToolbar($element, $callback=NULL) {
+		$tb=$this->getToolbar();
 		if ($element instanceof BaseWidget) {
-			if ($element->getIdentifier() === "") {
-				$element->setIdentifier("tb-item-" . $this->identifier . "-" . $tb->count());
+			if ($element->getIdentifier()==="") {
+				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
 			}
 		}
 		if (isset($callback)) {
@@ -286,8 +286,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
-		$result = $this->addInToolbar($caption, $callback);
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
+		$result=$this->addInToolbar($caption, $callback);
 		if (isset($icon) && method_exists($result, "addIcon"))
 			$result->addIcon($icon);
 		return $result;
@@ -300,7 +300,7 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\Widget
 	 */
-	public function addItemsInToolbar(array $items, $callback = NULL) {
+	public function addItemsInToolbar(array $items, $callback=NULL) {
 		if (JArray::isAssociative($items)) {
 			foreach ($items as $icon => $item) {
 				$this->addItemInToolbar($item, $icon, $callback);
@@ -321,10 +321,10 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdownInToolbar($value, $items, $callback = NULL) {
-		$dd = $value;
+	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);
 	}
@@ -337,8 +337,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonInToolbar($caption, $cssStyle = null, $callback = NULL) {
-		$bt = new HtmlButton("bt-" . $caption, $caption, $cssStyle);
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
 		return $this->addInToolbar($bt, $callback);
 	}
 
@@ -350,8 +350,8 @@ 
 	 *        	function($element)
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addButtonsInToolbar(array $captions, $asIcon = false, $callback = NULL) {
-		$bts = new HtmlButtonGroups("", $captions, $asIcon);
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
 		return $this->addInToolbar($bts, $callback);
 	}
 
@@ -363,14 +363,14 @@ 
 	 * @param boolean $labeled
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addLabelledIconButtonInToolbar($caption, $icon, $before = true, $labeled = false) {
-		$bt = new HtmlButton("", $caption);
+	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);
+	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);
 	}
@@ -393,8 +393,8 @@ 
 	 * @param boolean $_edition
 	 * @return \Ajax\common\Widget
 	 */
-	public function setEdition($_edition = true) {
-		$this->_edition = $_edition;
+	public function setEdition($_edition=true) {
+		$this->_edition=$_edition;
 		return $this;
 	}
 
@@ -423,8 +423,8 @@ 
 	 * @param string|boolean $disable
 	 * @return string
 	 */
-	public function jsDisabled($disable = true) {
-		return "$('#" . $this->identifier . " .ui.input,#" . $this->identifier . " .ui.dropdown,#" . $this->identifier . " .ui.checkbox').toggleClass('disabled'," . $disable . ");";
+	public function jsDisabled($disable=true) {
+		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
 	}
 
 	/**
@@ -434,8 +434,8 @@ 
 	 *        	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')")));
@@ -443,18 +443,18 @@ 
 	}
 
 	public function setToolbar(HtmlMenu $_toolbar) {
-		$this->_toolbar = $_toolbar;
+		$this->_toolbar=$_toolbar;
 		return $this;
 	}
 
 	public function setToolbarPosition($_toolbarPosition) {
-		$this->_toolbarPosition = $_toolbarPosition;
+		$this->_toolbarPosition=$_toolbarPosition;
 		return $this;
 	}
 
 	public function getForm() {
-		if (! isset($this->_form)) {
-			$this->_form = new HtmlForm("frm-" . $this->identifier);
+		if (!isset($this->_form)) {
+			$this->_form=new HtmlForm("frm-".$this->identifier);
 			$this->setEdition(true);
 		}
 		return $this->_form;
@@ -468,7 +468,7 @@ 
 	}
 
 	protected function runForm(JsUtils $js) {
-		$fields = $this->getContentInstances(HtmlFormField::class);
+		$fields=$this->getContentInstances(HtmlFormField::class);
 		foreach ($fields as $field) {
 			$this->_form->addField($field);
 		}
@@ -477,10 +477,10 @@ 
 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
-			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
-				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
 		}
 	}
 
@@ -502,21 +502,21 @@ 
 	}
 
 	public function swapFields($index1, $index2) {
-		$index1 = $this->_getIndex($index1);
-		$index2 = $this->_getIndex($index2);
+		$index1=$this->_getIndex($index1);
+		$index2=$this->_getIndex($index2);
 		return $this->_instanceViewer->swapFields($index1, $index2);
 	}
 
 	public function removeField($index) {
-		$index = $this->_getIndex($index);
-		if ($index !== false) {
+		$index=$this->_getIndex($index);
+		if ($index!==false) {
 			$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)) {
 			$this->_form->onSuccess($modal->jsHide());
@@ -524,7 +524,7 @@ 
 		return $modal;
 	}
 
-	public function addToProperty($name, $value, $separator = " ") {
+	public function addToProperty($name, $value, $separator=" ") {
 		return $this->getHtmlComponent()->addToProperty($name, $value, $separator);
 	}
 

Braces +6 added lines, -4 removed lines

@@ -288,8 +288,9 @@ 
 	 */
 	public function addItemInToolbar($caption, $icon = NULL, $callback = NULL) {
 		$result = $this->addInToolbar($caption, $callback);
-		if (isset($icon) && method_exists($result, "addIcon"))
-			$result->addIcon($icon);
+		if (isset($icon) && method_exists($result, "addIcon")) {
+					$result->addIcon($icon);
+		}
 		return $result;
 	}
 
@@ -478,8 +479,9 @@ 
 	protected function _compileForm() {
 		if (isset($this->_form)) {
 			$noValidate = "";
-			if (\sizeof($this->_form->getValidationParams()) > 0)
-				$noValidate = "novalidate";
+			if (\sizeof($this->_form->getValidationParams()) > 0) {
+							$noValidate = "novalidate";
+			}
 				$this->wrapContent("<form class='".$this->_form->getProperty('class')."' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
 		}
 	}