phpMv / phpMv-UI

Ajax/ui/components/DialogButton.php

Spacing +8 added lines, -8 removed lines

@@ -14,15 +14,15 @@ 
 class DialogButton extends BaseComponent {
 
 	private function addFunction($jsCode) {
-		if (! JString::startsWith($jsCode, "function"))
-			$jsCode = "%function(){" . $jsCode . "}%";
+		if (!JString::startsWith($jsCode, "function"))
+			$jsCode="%function(){".$jsCode."}%";
 		return $jsCode;
 	}
 
-	public function __construct($caption, $jsCode, $event = "click") {
+	public function __construct($caption, $jsCode, $event="click") {
 		parent::__construct(NULL);
-		$this->params["text"] = $caption;
-		$this->params[$event] = $this->addFunction($jsCode);
+		$this->params["text"]=$caption;
+		$this->params[$event]=$this->addFunction($jsCode);
 	}
 
 	public function __toString() {
@@ -37,7 +37,7 @@ 
 		return json_encode($this->params, JSON_UNESCAPED_SLASHES);
 	}
 
-	public static function cancelButton($caption = "Annuler") {
+	public static function cancelButton($caption="Annuler") {
 		return new DialogButton($caption, "$( this ).dialog( 'close' );");
 	}
 
@@ -52,7 +52,7 @@ 
 	 *        	default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null)
 	 * @return DialogButton
 	 */
-	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption = "Okay", $parameters = []) {
-		return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement, $parameters) . ";$( this ).dialog( 'close' );");
+	public static function submitButton(JsUtils $js, $url, $form, $responseElement, $caption="Okay", $parameters=[]) {
+		return new DialogButton($caption, $js->postFormDeferred($url, $form, $responseElement, $parameters).";$( this ).dialog( 'close' );");
 	}
 }

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 class DialogButton extends BaseComponent {
 
 	private function addFunction($jsCode) {
-		if (! JString::startsWith($jsCode, "function"))
-			$jsCode = "%function(){" . $jsCode . "}%";
+		if (! JString::startsWith($jsCode, "function")) {
+					$jsCode = "%function(){" . $jsCode . "}%";
+		}
 		return $jsCode;
 	}
 

Ajax/ui/components/Buttonset.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->uiName = "buttonset";
+		$this->uiName="buttonset";
 	}
 
 	/**

Ajax/ui/properties/Position.php

Spacing +3 added lines, -3 removed lines

@@ -11,7 +11,7 @@ 
  */
 class Position extends BaseComponent {
 
-	public function __construct($my = "left top", $at = "left bottom", $collision = "none", $within = "window") {
+	public function __construct($my="left top", $at="left bottom", $collision="none", $within="window") {
 		$this->setParam("my", $my);
 		$this->setParam("at", $at);
 		$this->setParam("collision", $collision);
@@ -82,8 +82,8 @@ 
 	}
 
 	protected function setParamCtrl($key, $value, $typeCtrl) {
-		if (! $typeCtrl($value)) {
-			throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $key . " à la position");
+		if (!$typeCtrl($value)) {
+			throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." à la position");
 		} else
 			$this->setParam($key, $value);
 	}

Braces +3 added lines, -2 removed lines

@@ -84,8 +84,9 @@
 	protected function setParamCtrl($key, $value, $typeCtrl) {
 		if (! $typeCtrl($value)) {
 			throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $key . " à la position");
-		} else
-			$this->setParam($key, $value);
+		} else {
+					$this->setParam($key, $value);
+		}
 	}
 
 	/*

Ajax/ui/properties/Animation.php

Spacing +1 added lines, -1 removed lines

@@ -11,7 +11,7 @@
  */
 class Animation extends BaseComponent {
 
-	public function __construct($duration = 400, $easing = "swing", $queue = false) {
+	public function __construct($duration=400, $easing="swing", $queue=false) {
 		$this->setDuration($duration);
 		$this->setEasing($easing);
 		$this->setQueue($queue);

Ajax/semantic/html/base/HtmlSemDoubleElement.php

Spacing +36 added lines, -36 removed lines

@@ -23,22 +23,22 @@ 
 class HtmlSemDoubleElement extends HtmlDoubleElement {
 	use BaseTrait;
 
-	protected $_popup = NULL;
+	protected $_popup=NULL;
 
-	protected $_dimmer = NULL;
+	protected $_dimmer=NULL;
 
-	protected $_toast = NULL;
+	protected $_toast=NULL;
 
-	protected $_sidebar = NULL;
+	protected $_sidebar=NULL;
 
-	protected $_params = array();
+	protected $_params=array();
 
-	public function __construct($identifier, $tagName = "p", $baseClass = "ui", $content = NULL) {
+	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
 		parent::__construct($identifier, $tagName);
-		$this->_baseClass = $baseClass;
+		$this->_baseClass=$baseClass;
 		$this->setClass($baseClass);
 		if (isset($content)) {
-			$this->content = $content;
+			$this->content=$content;
 		}
 	}
 
@@ -48,7 +48,7 @@ 
 	 * @param string $variation
 	 * @param string $popupEvent
 	 */
-	public function setPopupAttributes($variation = NULL, $popupEvent = NULL) {
+	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
 		if (isset($this->_popup))
 			$this->_popup->setAttributes($variation, $popupEvent);
 	}
@@ -62,8 +62,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopup($title = "", $content = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this, $title, $content, $variation, $params);
+	public function addPopup($title="", $content="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this, $title, $content, $variation, $params);
 		return $this;
 	}
 
@@ -75,8 +75,8 @@ 
 	 * @param array $params
 	 * @return HtmlSemDoubleElement
 	 */
-	public function addPopupHtml($html = "", $variation = NULL, $params = array()) {
-		$this->_popup = new InternalPopup($this);
+	public function addPopupHtml($html="", $variation=NULL, $params=array()) {
+		$this->_popup=new InternalPopup($this);
 		$this->_popup->setHtml($html);
 		$this->_popup->setAttributes($variation, $params);
 		return $this;
@@ -89,8 +89,8 @@ 
 	 * @param mixed $content
 	 * @return HtmlDimmer
 	 */
-	public function addDimmer($params = array(), $content = NULL) {
-		$dimmer = new HtmlDimmer("dimmer-" . $this->identifier, $content);
+	public function addDimmer($params=array(), $content=NULL) {
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
 		$dimmer->setParams($params);
 		$dimmer->setContainer($this);
 		$this->addContent($dimmer);
@@ -105,10 +105,10 @@ 
 	 * @param string $icon
 	 * @return mixed|HtmlLabel
 	 */
-	public function addLabel($label, $before = false, $icon = NULL) {
-		$labelO = $label;
-		if (\is_object($label) === false) {
-			$labelO = new HtmlLabel("label-" . $this->identifier, $label);
+	public function addLabel($label, $before=false, $icon=NULL) {
+		$labelO=$label;
+		if (\is_object($label)===false) {
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
 			if (isset($icon))
 				$labelO->addIcon($icon);
 		} else {
@@ -129,8 +129,8 @@ 
 	 * @param string $icon
 	 * @return HtmlSemDoubleElement
 	 */
-	public function attachLabel($label, $side = Side::TOP, $direction = Direction::NONE, $icon = NULL) {
-		$label = $this->addLabel($label, true, $icon);
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
+		$label=$this->addLabel($label, true, $icon);
 		$label->setAttached($side, $direction);
 		return $this;
 	}
@@ -140,7 +140,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asLink($href = NULL, $target = NULL) {
+	public function asLink($href=NULL, $target=NULL) {
 		if (isset($href))
 			$this->setProperty("href", $href);
 		if (isset($target))
@@ -154,11 +154,11 @@ 
 	 * @param boolean $show
 	 * @return string
 	 */
-	public function jsShowDimmer($show = true) {
-		$status = "hide";
-		if ($show === true)
-			$status = "show";
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
+	public function jsShowDimmer($show=true) {
+		$status="hide";
+		if ($show===true)
+			$status="show";
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 	 * {@inheritdoc}
 	 * @see BaseHtml::compile()
 	 */
-	public function compile(JsUtils $js = NULL, &$view = NULL) {
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
 		if (isset($this->_popup)) {
 			$this->_popup->compile($js);
 		}
@@ -179,7 +179,7 @@ 
 	 * @see HtmlDoubleElement::run()
 	 */
 	public function run(JsUtils $js) {
-		$this->_bsComponent = $js->semantic()->generic("#" . $this->identifier);
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
 		parent::run($js);
 		$this->addEventsOnRun($js);
 		if (isset($this->_popup)) {
@@ -197,8 +197,8 @@ 
 	 * @param boolean $ordered
 	 * @return \Ajax\common\html\html5\HtmlList
 	 */
-	public function addList($items, $ordered = false) {
-		$list = new HtmlList("list-" . $this->identifier, $items);
+	public function addList($items, $ordered=false) {
+		$list=new HtmlList("list-".$this->identifier, $items);
 		$list->setOrdered($ordered);
 		$list->setClass("ui list");
 		$this->addContent($list);
@@ -210,9 +210,9 @@ 
 	 * @param ?array $params
 	 * @return \Ajax\semantic\components\Toast
 	 */
-	public function asToast($params = NULL) {
-		$this->_toast = new Toast();
-		$this->_toast->attach('#' . $this->_identifier);
+	public function asToast($params=NULL) {
+		$this->_toast=new Toast();
+		$this->_toast->attach('#'.$this->_identifier);
 		$this->setProperty('style', 'display:none;');
 		if (isset($params)) {
 			$this->_toast->setParams($params);
@@ -226,8 +226,8 @@ 
 	 * @param string $classes
 	 * @return \Ajax\semantic\components\Sidebar
 	 */
-	public function asSideBar($classes = '') {
-		$this->_sidebar = new Sidebar();
+	public function asSideBar($classes='') {
+		$this->_sidebar=new Sidebar();
 		$this->addToProperty('class', 'sidebar');
 		return $this->_sidebar;
 	}

Braces +15 added lines, -10 removed lines

@@ -49,8 +49,9 @@ 
 	 * @param string $popupEvent
 	 */
 	public function setPopupAttributes($variation = NULL, $popupEvent = NULL) {
-		if (isset($this->_popup))
-			$this->_popup->setAttributes($variation, $popupEvent);
+		if (isset($this->_popup)) {
+					$this->_popup->setAttributes($variation, $popupEvent);
+		}
 	}
 
 	/**
@@ -109,8 +110,9 @@ 
 		$labelO = $label;
 		if (\is_object($label) === false) {
 			$labelO = new HtmlLabel("label-" . $this->identifier, $label);
-			if (isset($icon))
-				$labelO->addIcon($icon);
+			if (isset($icon)) {
+							$labelO->addIcon($icon);
+			}
 		} else {
 			$labelO->addToPropertyCtrl("class", "label", array(
 				"label"
@@ -141,10 +143,12 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function asLink($href = NULL, $target = NULL) {
-		if (isset($href))
-			$this->setProperty("href", $href);
-		if (isset($target))
-			$this->setProperty("target", $target);
+		if (isset($href)) {
+					$this->setProperty("href", $href);
+		}
+		if (isset($target)) {
+					$this->setProperty("target", $target);
+		}
 		return $this->setTagName("a");
 	}
 
@@ -156,8 +160,9 @@ 
 	 */
 	public function jsShowDimmer($show = true) {
 		$status = "hide";
-		if ($show === true)
-			$status = "show";
+		if ($show === true) {
+					$status = "show";
+		}
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
 	}
 

Ajax/semantic/components/Sidebar.php

Spacing +13 added lines, -13 removed lines

@@ -14,9 +14,9 @@ 
  */
 class Sidebar extends SimpleSemExtComponent {
 
-	public function __construct(JsUtils $js = NULL) {
+	public function __construct(JsUtils $js=NULL) {
 		parent::__construct($js);
-		$this->uiName = 'sidebar';
+		$this->uiName='sidebar';
 	}
 
 	public function show() {
@@ -46,32 +46,32 @@ 
 	}
 
 	public function setContext($value) {
-		$this->params['context'] = $value;
+		$this->params['context']=$value;
 		return $this;
 	}
 
-	public function setExclusive($value = true) {
-		$this->params['exclusive'] = true;
+	public function setExclusive($value=true) {
+		$this->params['exclusive']=true;
 		return $this;
 	}
 
-	public function setClosable($value = true) {
-		$this->params['closable'] = $value;
+	public function setClosable($value=true) {
+		$this->params['closable']=$value;
 		return $this;
 	}
 
-	public function setDimPage($value = true) {
-		$this->params['dimPage'] = $value;
+	public function setDimPage($value=true) {
+		$this->params['dimPage']=$value;
 		return $this;
 	}
 
-	public function setScrollLock($value = false) {
-		$this->params['scrollLock'] = $value;
+	public function setScrollLock($value=false) {
+		$this->params['scrollLock']=$value;
 		return $this;
 	}
 
-	public function setReturnScroll($value = false) {
-		$this->params['returnScroll'] = $value;
+	public function setReturnScroll($value=false) {
+		$this->params['returnScroll']=$value;
 		return $this;
 	}
 

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/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='ui form' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
+			$noValidate="";
+			if (\sizeof($this->_form->getValidationParams())>0)
+				$noValidate="novalidate";
+			$this->wrapContent("<form class='ui form' 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='ui form' id='frm-" . $this->identifier . "' name='frm-" . $this->identifier . "' " . $noValidate . ">", "</form>");
 		}
 	}