phpMv / phpMv-UI

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

Spacing +28 added lines, -28 removed lines

@@ -27,10 +27,10 @@ 
 
 	public function __construct($identifier, $rowCount, $colCount) {
 		parent::__construct($identifier, "table", "ui table");
-		$this->content=array ();
+		$this->content=array();
 		$this->setRowCount($rowCount, $colCount);
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
-		$this->_compileParts=["thead","tbody","tfoot"];
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
+		$this->_compileParts=["thead", "tbody", "tfoot"];
 		$this->_afterCompileEvents=[];
 	}
 
@@ -48,9 +48,9 @@ 
 	 * @return HtmlTableContent
 	 */
 	public function getPart($key) {
-		if (\array_key_exists($key, $this->content) === false) {
+		if (\array_key_exists($key, $this->content)===false) {
 			$this->content[$key]=new HtmlTableContent("", $key);
-			if ($key !== "tbody") {
+			if ($key!=="tbody") {
 				$this->content[$key]->setRowCount(1, $this->_colCount);
 			}
 		}
@@ -95,7 +95,7 @@ 
 	 * @return boolean
 	 */
 	public function hasPart($key) {
-		return \array_key_exists($key, $this->content) === true;
+		return \array_key_exists($key, $this->content)===true;
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 
 	private function colAlign($colIndex, $function) {
 		if (\is_array($colIndex)) {
-			foreach ( $colIndex as $cIndex ) {
+			foreach ($colIndex as $cIndex) {
 				$this->colAlign($cIndex, $function);
 			}
 		} else {
@@ -291,7 +291,7 @@ 
 	 * @see HtmlSemDoubleElement::compile()
 	 */
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
-		if(\sizeof($this->_compileParts)<3){
+		if (\sizeof($this->_compileParts)<3) {
 			$this->_template="%content%";
 			$this->refresh();
 		}
@@ -301,9 +301,9 @@ 
 
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
 		if ($this->propertyContains("class", "sortable")) {
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
 		}
-		if(isset($this->_activeRowSelector)){
+		if (isset($this->_activeRowSelector)) {
 			$this->_activeRowSelector->compile();
 		}
 	}
@@ -317,13 +317,13 @@ 
 	public function fromDatabaseObject($object, $function) {
 		$result=$function($object);
 		if (\is_array($result)) {
-			$result= $this->addRow($function($object));
+			$result=$this->addRow($function($object));
 		} else {
-			$result= $this->getBody()->_addRow($result);
+			$result=$this->getBody()->_addRow($result);
 		}
-		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
 		}
 		return $result;
 	}
@@ -338,14 +338,14 @@ 
 		return $this;
 	}
 
-	public function refresh(){
+	public function refresh() {
 		$this->_footer=$this->getFooter();
 		$this->addEvent("execute", '$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");');
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
-		if(isset($this->_footer))
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
+		if (isset($this->_footer))
 			$this->_footer->run($js);
 		return $result;
 	}
@@ -368,27 +368,27 @@ 
 	 * @param boolean $multiple
 	 * @return HtmlTable
 	 */
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
 		return $this;
 	}
 
-	public function hideColumn($colIndex){
-		if($this->hasPart("thead")){
+	public function hideColumn($colIndex) {
+		if ($this->hasPart("thead")) {
 			$this->getHeader()->hideColumn($colIndex);
 		}
 		$this->getBody()->hideColumn($colIndex);
-		if($this->hasPart("tfoot")){
+		if ($this->hasPart("tfoot")) {
 			$this->getFooter()->hideColumn($colIndex);
 		}
 		return $this;
 	}
 	
-	public function setColWidth($colIndex,$width){
-		if($this->hasPart("thead")){
+	public function setColWidth($colIndex, $width) {
+		if ($this->hasPart("thead")) {
 			$this->getHeader()->getCell(0, $colIndex)->setWidth($width);
-		}else{
-			if($this->getBody()->count()>0)
+		} else {
+			if ($this->getBody()->count()>0)
 				$this->getBody()->getCell(0, $colIndex)->setWidth($width);
 		}
 		return $this;

Braces +10 added lines, -7 removed lines

@@ -322,8 +322,9 @@ 
 			$result= $this->getBody()->_addRow($result);
 		}
 		if(isset($this->_afterCompileEvents["onNewRow"])){
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
+			if(\is_callable($this->_afterCompileEvents["onNewRow"])) {
+							$this->_afterCompileEvents["onNewRow"]($result,$object);
+			}
 		}
 		return $result;
 	}
@@ -345,8 +346,9 @@ 
 
 	public function run(JsUtils $js){
 		$result= parent::run($js);
-		if(isset($this->_footer))
-			$this->_footer->run($js);
+		if(isset($this->_footer)) {
+					$this->_footer->run($js);
+		}
 		return $result;
 	}
 
@@ -387,9 +389,10 @@ 
 	public function setColWidth($colIndex,$width){
 		if($this->hasPart("thead")){
 			$this->getHeader()->getCell(0, $colIndex)->setWidth($width);
-		}else{
-			if($this->getBody()->count()>0)
-				$this->getBody()->getCell(0, $colIndex)->setWidth($width);
+		} else{
+			if($this->getBody()->count()>0) {
+							$this->getBody()->getCell(0, $colIndex)->setWidth($width);
+			}
 		}
 		return $this;
 	}

Ajax/semantic/html/elements/HtmlButtonGroups.php

Doc Comments +4 added lines

@@ -15,6 +15,10 @@
  */
 class HtmlButtonGroups extends HtmlSemCollection {
 	protected $_dropdown;
+
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
 		if ($asIcons === true)

Spacing +16 added lines, -16 removed lines

@@ -17,18 +17,18 @@ 
 	protected $_dropdown;
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
-		if ($asIcons === true)
+		if ($asIcons===true)
 			$this->asIcons();
 		$this->addElements($elements, $asIcons);
 	}
-	protected function createItem($value){
+	protected function createItem($value) {
 		return new HtmlButton("", $value);
 	}
 
-	public function addDropdown($items,$asCombo=false){
-		$dd= new HtmlDropdown("dd-".$this->identifier,null,$items);
+	public function addDropdown($items, $asCombo=false) {
+		$dd=new HtmlDropdown("dd-".$this->identifier, null, $items);
 		$dd->asButton();
-		if($asCombo){
+		if ($asCombo) {
 			$dd->setAction("combo");
 			$dd->addToProperty("class", "combo");
 		}
@@ -39,13 +39,13 @@ 
 
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
-		if($asIcon)
+		if ($asIcon)
 			$item->asIcon($element);
 		return $item;
 	}
 
 	public function addElements($elements, $asIcons=false) {
-		foreach ( $elements as $element ) {
+		foreach ($elements as $element) {
 			$this->addElement($element, $asIcons);
 		}
 		return $this;
@@ -54,7 +54,7 @@ 
 	public function insertOr($aferIndex=0, $or="or") {
 		$orElement=new HtmlSemDoubleElement("", "div", "or");
 		$orElement->setProperty("data-text", $or);
-		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
+		array_splice($this->content, $aferIndex+1, 0, array($orElement));
 		return $this;
 	}
 
@@ -67,8 +67,8 @@ 
 	}
 
 	public function asIcons() {
-		foreach ( $this->content as $item ) {
-			if($item instanceof HtmlButton)
+		foreach ($this->content as $item) {
+			if ($item instanceof HtmlButton)
 			$item->asIcon($item->getContent());
 		}
 		return $this->addToProperty("class", "icons");
@@ -101,7 +101,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ( $this->content as $element ) {
+		foreach ($this->content as $element) {
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
@@ -113,10 +113,10 @@ 
 
 	public function addClasses($classes=array()) {
 		$i=0;
-		if(!\is_array($classes)){
-			$classes=array_fill (0,$this->count(),$classes);
+		if (!\is_array($classes)) {
+			$classes=array_fill(0, $this->count(), $classes);
 		}
-		foreach ( $this->content as $button ) {
+		foreach ($this->content as $button) {
 			$button->addToProperty("class", $classes[$i++]);
 		}
 		return $this;
@@ -130,8 +130,8 @@ 
 		$this->addElement($function($object));
 	}
 
-	public function run(JsUtils $js){
-		$result= parent::run($js);
+	public function run(JsUtils $js) {
+		$result=parent::run($js);
 		return $result->setItemSelector(".ui.button");
 	}
 

Braces +9 added lines, -6 removed lines

@@ -17,8 +17,9 @@ 
 	protected $_dropdown;
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
 		parent::__construct($identifier, "div", "ui buttons");
-		if ($asIcons === true)
-			$this->asIcons();
+		if ($asIcons === true) {
+					$this->asIcons();
+		}
 		$this->addElements($elements, $asIcons);
 	}
 	protected function createItem($value){
@@ -39,8 +40,9 @@ 
 
 	public function addElement($element, $asIcon=false) {
 		$item=$this->addItem($element);
-		if($asIcon)
-			$item->asIcon($element);
+		if($asIcon) {
+					$item->asIcon($element);
+		}
 		return $item;
 	}
 
@@ -68,8 +70,9 @@ 
 
 	public function asIcons() {
 		foreach ( $this->content as $item ) {
-			if($item instanceof HtmlButton)
-			$item->asIcon($item->getContent());
+			if($item instanceof HtmlButton) {
+						$item->asIcon($item->getContent());
+			}
 		}
 		return $this->addToProperty("class", "icons");
 	}

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

Spacing +37 added lines, -37 removed lines

@@ -13,27 +13,27 @@ 
  * @author jc
  *
  */
-trait FormTrait{
+trait FormTrait {
 
 	/**
 	 * @return HtmlForm
 	 */
 	abstract protected function getForm();
 
-	protected function addCompoValidation($compo,$field){
+	protected function addCompoValidation($compo, $field) {
 		$validation=$field->getValidation();
-		if(isset($validation)){
+		if (isset($validation)) {
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
 			$compo->addFieldValidation($validation);
 		}
 		return $compo;
 	}
 
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
 		$form=$this->getForm();
 		$params=$form->getValidationParams();
-		if(isset($params["_ajaxSubmit"])){
-			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
+		if (isset($params["_ajaxSubmit"])) {
+			$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js);
 			$this->onSuccess($compilation);
 			$form->removeValidationParam("_ajaxSubmit");
 		}
@@ -42,16 +42,16 @@ 
 		$form->addEventsOnRun($js);
 	}
 
-	protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){
+	protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) {
 		$compilation="";
-		if(\is_array($ajaxSubmit)){
-			foreach ($ajaxSubmit as $ajaxSubmitItem){
+		if (\is_array($ajaxSubmit)) {
+			foreach ($ajaxSubmit as $ajaxSubmitItem) {
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		}elseif ($ajaxSubmit instanceof AjaxCall) {
 			$compilation=$ajaxSubmit->compile($js);
 		}
-		$compilation=str_ireplace("\"","%quote%", $compilation);
+		$compilation=str_ireplace("\"", "%quote%", $compilation);
 		return $compilation;
 	}
 
@@ -64,14 +64,14 @@ 
 		return $this;
 	}
 
-	public function setAttached($value=true){
+	public function setAttached($value=true) {
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if ($value)
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
 		return $form;
 	}
 
-	public function addErrorMessage(){
+	public function addErrorMessage() {
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
 	}
 
@@ -87,47 +87,47 @@ 
 	 * @param array $parameters
 	 * @return HtmlForm
 	 */
-	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
+	public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) {
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
+		if ($identifierOrElement  instanceof BaseHtml)
 			$elem=$identifierOrElement;
 		else
 			$elem=$form->getElementById($identifierOrElement, $form->getContent());
-		if(isset($elem)){
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
+		if (isset($elem)) {
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters);
 		}
 		return $form;
 	}
 
-	public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){
-		return $this->submitOn("click", $identifier, $url, $responseElement,$parameters);
+	public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) {
+		return $this->submitOn("click", $identifier, $url, $responseElement, $parameters);
 	}
 
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters);
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters);
 	}
 
-	protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
+	protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		if(isset($url) && isset($responseElement)){
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
-			$this->setSubmitParams($url,$responseElement,$parameters);
+		if (isset($url) && isset($responseElement)) {
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
+			$this->setSubmitParams($url, $responseElement, $parameters);
 		}
 		return $button;
 	}
 
-	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
+	public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) {
 		$form=$this->getForm();
-		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters))
-			$params=\array_merge($params,$parameters);
+		$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
+		if (\is_array($parameters))
+			$params=\array_merge($params, $parameters);
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}
 
-	public function addReset($identifier,$value,$cssStyle=NULL){
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
+	public function addReset($identifier, $value, $cssStyle=NULL) {
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
 		$bt->setProperty("type", "reset");
 		return $bt;
 	}
@@ -137,7 +137,7 @@ 
 	 * @param string $jsCode
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function onValid($jsCode){
+	public function onValid($jsCode) {
 		$form=$this->getForm();
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
 		return $form;
@@ -148,9 +148,9 @@ 
 	 * @param string $jsCode can use event and fields parameters
 	 * @return HtmlForm
 	 */
-	public function onSuccess($jsCode){
+	public function onSuccess($jsCode) {
 		$form=$this->getForm();
-		$form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%");
+		$form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%");
 		return $form;
 	}
 }
\ No newline at end of file

Braces +12 added lines, -9 removed lines

@@ -48,7 +48,7 @@ 
 			foreach ($ajaxSubmit as $ajaxSubmitItem){
 				$compilation.=$ajaxSubmitItem->compile($js);
 			}
-		}elseif($ajaxSubmit instanceof AjaxCall){
+		} elseif($ajaxSubmit instanceof AjaxCall){
 			$compilation=$ajaxSubmit->compile($js);
 		}
 		$compilation=str_ireplace("\"","%quote%", $compilation);
@@ -66,8 +66,9 @@ 
 
 	public function setAttached($value=true){
 		$form=$this->getForm();
-		if($value)
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$form->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $form;
 	}
 
@@ -89,10 +90,11 @@ 
 	 */
 	public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){
 		$form=$this->getForm();
-		if($identifierOrElement  instanceof BaseHtml)
-			$elem=$identifierOrElement;
-		else
-			$elem=$form->getElementById($identifierOrElement, $form->getContent());
+		if($identifierOrElement  instanceof BaseHtml) {
+					$elem=$identifierOrElement;
+		} else {
+					$elem=$form->getElementById($identifierOrElement, $form->getContent());
+		}
 		if(isset($elem)){
 			$this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters);
 		}
@@ -120,8 +122,9 @@ 
 	public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){
 		$form=$this->getForm();
 		$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
-		if(\is_array($parameters))
-			$params=\array_merge($params,$parameters);
+		if(\is_array($parameters)) {
+					$params=\array_merge($params,$parameters);
+		}
 		$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
 		return $this;
 	}

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

Spacing +4 added lines, -4 removed lines

@@ -17,10 +17,10 @@
 	 * {@inheritDoc}
 	 * @see \Ajax\semantic\html\base\HtmlSemDoubleElement::run()
 	 */
-	public function run(JsUtils $js){
-		if(!isset($this->_bsComponent)){
-			if(isset($this->_timeout)){
-				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});",true);
+	public function run(JsUtils $js) {
+		if (!isset($this->_bsComponent)) {
+			if (isset($this->_timeout)) {
+				$js->exec("setTimeout(function() { $('#{$this->identifier}').transition({$this->_closeTransition}); }, {$this->_timeout});", true);
 			}
 		}
 		return parent::run($js);

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

Spacing +22 added lines, -22 removed lines

@@ -14,8 +14,8 @@ 
  * @property string $identifier
  */
 trait BaseTrait {
-	protected $_variations=[ ];
-	protected $_states=[ ];
+	protected $_variations=[];
+	protected $_states=[];
 	protected $_baseClass;
 
 	abstract protected function setPropertyCtrl($name, $value, $typeCtrl);
@@ -28,7 +28,7 @@ 
 
 	abstract public function setProperty($name, $value);
 
-	abstract public function addContent($content,$before=false);
+	abstract public function addContent($content, $before=false);
 
 	abstract public function onCreate($jsCode);
 
@@ -49,7 +49,7 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -63,7 +63,7 @@ 
 	public function addVariations($variations=array()) {
 		if (\is_string($variations))
 			$variations=\explode(" ", $variations);
-		foreach ( $variations as $variation ) {
+		foreach ($variations as $variation) {
 			$this->addVariation($variation);
 		}
 		return $this;
@@ -72,7 +72,7 @@ 
 	public function addStates($states=array()) {
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
@@ -82,17 +82,17 @@ 
 		$this->setProperty("class", $this->_baseClass);
 		if (\is_string($states))
 			$states=\explode(" ", $states);
-		foreach ( $states as $state ) {
+		foreach ($states as $state) {
 			$this->addState($state);
 		}
 		return $this;
 	}
 
 	public function addIcon($icon, $before=true) {
-		return $this->addContent(new HtmlIcon("icon-" . $this->identifier, $icon), $before);
+		return $this->addContent(new HtmlIcon("icon-".$this->identifier, $icon), $before);
 	}
 
-	public function addSticky($context="body"){
+	public function addSticky($context="body") {
 		$this->onCreate("$('#".$this->identifier."').sticky({ context: '".$context."'});");
 		return $this;
 	}
@@ -113,7 +113,7 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
+		if ($disable)
 			$this->addToProperty("class", "disabled");
 		return $this;
 	}
@@ -139,7 +139,7 @@ 
 	 *
 	 * @return HtmlSemDoubleElement
 	 */
-	public function asHeader(){
+	public function asHeader() {
 		return $this->addToProperty("class", "header");
 	}
 
@@ -147,15 +147,15 @@ 
 	 * show it is currently the active user selection
 	 * @return HtmlSemDoubleElement
 	 */
-	public function setActive($value=true){
-		if($value)
+	public function setActive($value=true) {
+		if ($value)
 			$this->addToProperty("class", "active");
 		return $this;
 	}
 
-	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+	public function setAttached($value=true) {
+		if ($value)
+			$this->addToPropertyCtrl("class", "attached", array("attached"));
 		return $this;
 	}
 
@@ -171,7 +171,7 @@ 
 	}
 
 	public function setFloated($direction="right") {
-		return $this->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated"));
+		return $this->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated"));
 	}
 
 	public function floatRight() {
@@ -186,14 +186,14 @@ 
 		return $this->_baseClass;
 	}
 
-	protected function addBehavior(&$array,$key,$value,$before="",$after=""){
-		if(\is_string($value)){
-			if(isset($array[$key])){
+	protected function addBehavior(&$array, $key, $value, $before="", $after="") {
+		if (\is_string($value)) {
+			if (isset($array[$key])) {
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
+			} else
 				$array[$key]=$before.$value.$after;
-		}else{
+		} else {
 			$array[$key]=$value;
 		}
 		return $this;

Braces +25 added lines, -17 removed lines

@@ -47,8 +47,9 @@ 
 
 	public function setVariations($variations) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -61,8 +62,9 @@ 
 	}
 
 	public function addVariations($variations=array()) {
-		if (\is_string($variations))
-			$variations=\explode(" ", $variations);
+		if (\is_string($variations)) {
+					$variations=\explode(" ", $variations);
+		}
 		foreach ( $variations as $variation ) {
 			$this->addVariation($variation);
 		}
@@ -70,8 +72,9 @@ 
 	}
 
 	public function addStates($states=array()) {
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -80,8 +83,9 @@ 
 
 	public function setStates($states) {
 		$this->setProperty("class", $this->_baseClass);
-		if (\is_string($states))
-			$states=\explode(" ", $states);
+		if (\is_string($states)) {
+					$states=\explode(" ", $states);
+		}
 		foreach ( $states as $state ) {
 			$this->addState($state);
 		}
@@ -113,8 +117,9 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setDisabled($disable=true) {
-		if($disable)
-			$this->addToProperty("class", "disabled");
+		if($disable) {
+					$this->addToProperty("class", "disabled");
+		}
 		return $this;
 	}
 
@@ -148,14 +153,16 @@ 
 	 * @return HtmlSemDoubleElement
 	 */
 	public function setActive($value=true){
-		if($value)
-			$this->addToProperty("class", "active");
+		if($value) {
+					$this->addToProperty("class", "active");
+		}
 		return $this;
 	}
 
 	public function setAttached($value=true){
-		if($value)
-			$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		if($value) {
+					$this->addToPropertyCtrl("class", "attached", array ("attached" ));
+		}
 		return $this;
 	}
 
@@ -191,9 +198,10 @@ 
 			if(isset($array[$key])){
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
 				$array[$key]=$before.$p.$value.$after;
-			}else
-				$array[$key]=$before.$value.$after;
-		}else{
+			} else {
+							$array[$key]=$before.$value.$after;
+			}
+		} else{
 			$array[$key]=$value;
 		}
 		return $this;

Ajax/common/traits/JsUtilsAjaxTrait.php

Spacing +24 added lines, -24 removed lines

@@ -25,8 +25,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -37,8 +37,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $immediatly
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
 	}
 
 	/**
@@ -48,8 +48,8 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
+	public function jsonOn($event, $element, $url, $parameters=array()) {
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
 	}
 
 	/**
@@ -71,8 +71,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $rowClass the css class for the new element
 	 */
-	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") {
-		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL,$rowClass,true);
+	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") {
+		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, true);
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $rowClass the css class for the new element
 	 */
-	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json") {
-		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback,"id", NULL, $rowClass,false);
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json") {
+		return $this->js->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, "id", NULL, $rowClass, false);
 	}
 
 	/**
@@ -95,8 +95,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
 	}
 
 	/**
@@ -110,8 +110,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false,$jqueryDone,$ajaxTransition);
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition);
 	}
 
 	/**
@@ -150,8 +150,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -166,8 +166,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -181,7 +181,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -207,8 +207,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
 	}
 
 	/**
@@ -223,8 +223,8 @@ 
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
 	 * @param string|callable $ajaxTransition
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**