jcheron / phalcon-jquery

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

Spacing +33 added lines, -33 removed lines

@@ -13,62 +13,62 @@ 
  * @author jc
  * @version 1.001
  */
-class HtmlForm extends HtmlSemCollection{
+class HtmlForm extends HtmlSemCollection {
 
 	use FieldsTrait;
 
 	protected $_fields;
 
-	public function __construct( $identifier, $elements=array()){
-		parent::__construct( $identifier, "form", "ui form");
-		$this->_states=[State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED];
+	public function __construct($identifier, $elements=array()) {
+		parent::__construct($identifier, "form", "ui form");
+		$this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED];
 		$this->setProperty("name", $this->identifier);
 		$this->_fields=array();
 		$this->addItems($elements);
 	}
 
-	public function addHeader($title,$niveau=1,$dividing=true){
-		$header=new HtmlHeader("",$niveau,$title);
-		if($dividing)
+	public function addHeader($title, $niveau=1, $dividing=true) {
+		$header=new HtmlHeader("", $niveau, $title);
+		if ($dividing)
 			$header->setDividing();
 		return $this->addItem($header);
 	}
 
-	public function addFields($fields=NULL,$label=NULL){
-		if(isset($fields)){
-			if(!$fields instanceof HtmlFormFields){
-				if(\is_array($fields)===false){
-					$fields = \func_get_args();
+	public function addFields($fields=NULL, $label=NULL) {
+		if (isset($fields)) {
+			if (!$fields instanceof HtmlFormFields) {
+				if (\is_array($fields)===false) {
+					$fields=\func_get_args();
 					$end=\end($fields);
-					if(\is_string($end)){
+					if (\is_string($end)) {
 						$label=$end;
 						\array_pop($fields);
 					}else $label=NULL;
 				}
-				$this->_fields=\array_merge($this->_fields,$fields);
-				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(),$fields);
+				$this->_fields=\array_merge($this->_fields, $fields);
+				$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields);
 			}
-			if(isset($label))
-			 $fields=new HtmlFormField("", $fields,$label);
-		}else{
+			if (isset($label))
+			 $fields=new HtmlFormField("", $fields, $label);
+		}else {
 			$fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count());
 		}
 		$this->addItem($fields);
 		return $fields;
 	}
 
-	public function addItem($item){
+	public function addItem($item) {
 		$item=parent::addItem($item);
-		if(\is_subclass_of($item, HtmlFormField::class)===true){
+		if (\is_subclass_of($item, HtmlFormField::class)===true) {
 			$this->_fields[]=$item;
 		}
 		return $item;
 	}
 
-	public function getField($index){
-		if(\is_string($index)){
+	public function getField($index) {
+		if (\is_string($index)) {
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		}else {
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -78,7 +78,7 @@ 
 	 * automatically divide fields to be equal width
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
 	 */
-	public function setEqualWidth(){
+	public function setEqualWidth() {
 		return $this->addToProperty("class", "equal width");
 	}
 
@@ -87,7 +87,7 @@ 
 	 * @param HtmlFormField $field
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addField($field){
+	public function addField($field) {
 		return $this->addItem($field);
 	}
 
@@ -99,22 +99,22 @@ 
 	 * @param string $type
 	 * @return \Ajax\semantic\html\collections\HtmlMessage
 	 */
-	public function addMessage($identifier,$content,$header=NULL,$icon=NULL,$type=NULL){
-		$message=new HtmlMessage($identifier,$content);
-		if(isset($header))
+	public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) {
+		$message=new HtmlMessage($identifier, $content);
+		if (isset($header))
 			$message->addHeader($header);
-		if(isset($icon))
+		if (isset($icon))
 			$message->setIcon($icon);
-		if(isset($type))
+		if (isset($type))
 			$message->setStyle($type);
 		return $this->addItem($message);
 	}
 
-	public function setLoading(){
+	public function setLoading() {
 		return $this->addToProperty("class", "loading");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 }
\ No newline at end of file

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

Spacing +20 added lines, -20 removed lines

@@ -8,26 +8,26 @@ 
 
 class HtmlFormField extends HtmlSemDoubleElement {
 	protected $_container;
-	public function __construct($identifier, $field,$label=NULL) {
-		parent::__construct($identifier, "div","field");
+	public function __construct($identifier, $field, $label=NULL) {
+		parent::__construct($identifier, "div", "field");
 		$this->content=array();
-		$this->_states=[State::ERROR,State::DISABLED];
-		if(isset($label))
+		$this->_states=[State::ERROR, State::DISABLED];
+		if (isset($label))
 			$this->setLabel($label);
 		$this->setField($field);
 	}
 
-	public function setLabel($label){
+	public function setLabel($label) {
 		$labelO=$label;
-		if(\is_string($label)){
-			$labelO=new HtmlSemDoubleElement("","label");
+		if (\is_string($label)) {
+			$labelO=new HtmlSemDoubleElement("", "label");
 			$labelO->setContent($label);
-			$labelO->setProperty("for", \str_replace("field-", "",$this->identifier));
+			$labelO->setProperty("for", \str_replace("field-", "", $this->identifier));
 		}
 		$this->content["label"]=$labelO;
 	}
 
-	public function setField($field){
+	public function setField($field) {
 		$this->content["field"]=$field;
 	}
 
@@ -35,8 +35,8 @@ 
 	 * Returns the label or null
 	 * @return mixed
 	 */
-	public function getLabel(){
-		if(\array_key_exists("label", $this->content))
+	public function getLabel() {
+		if (\array_key_exists("label", $this->content))
 			return $this->content["label"];
 	}
 
@@ -44,14 +44,14 @@ 
 	 * Return the field
 	 * @return mixed
 	 */
-	public function getField(){
+	public function getField() {
 		return $this->content["field"];
 	}
 
 	/**
 	 * puts the label before or behind
 	 */
-	public function swapLabel(){
+	public function swapLabel() {
 		$label=$this->getLabel();
 		unset($this->content["label"]);
 		$this->content["label"]=$label;
@@ -62,27 +62,27 @@ 
 	 * @param int $width
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setWidth($width){
-		if(\is_int($width)){
+	public function setWidth($width) {
+		if (\is_int($width)) {
 			$width=Wide::getConstants()["W".$width];
 		}
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
-		if(isset($this->_container)){
+		if (isset($this->_container)) {
 			$this->_container->setEqualWidth(false);
 		}
-		return $this->addToPropertyCtrl("class", "wide",array("wide"));
+		return $this->addToPropertyCtrl("class", "wide", array("wide"));
 	}
 
 	/**
 	 * Field displays an error state
 	 * @return \Ajax\semantic\html\collections\form\HtmlFormField
 	 */
-	public function setError(){
+	public function setError() {
 		return $this->addToProperty("class", "error");
 	}
 
-	public function jsState($state){
-		return $this->jsDoJquery("addClass",$state);
+	public function jsState($state) {
+		return $this->jsDoJquery("addClass", $state);
 	}
 
 	public function setContainer($_container) {

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

Spacing +17 added lines, -17 removed lines

@@ -9,23 +9,23 @@ 
 use Ajax\semantic\html\collections\form\HtmlFormCheckbox;
 use Ajax\semantic\html\collections\form\HtmlFormRadio;
 trait FieldsTrait {
-	protected function createItem($value){
-		if(\is_array($value)){
-			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null)));
+	protected function createItem($value) {
+		if (\is_array($value)) {
+			$itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null)));
 			return $itemO;
 		}else
 			return new HtmlFormInput($value);
 	}
 
-	public function addInputs($inputs,$fieldslabel=null){
+	public function addInputs($inputs, $fieldslabel=null) {
 		$fields=array();
-		foreach ($inputs as $input){
+		foreach ($inputs as $input) {
 			\extract($input);
-			$f=new HtmlFormInput("","");
+			$f=new HtmlFormInput("", "");
 			$f->fromArray($input);
 			$fields[]=$f;
 		}
-		return $this->addFields($fields,$fieldslabel);
+		return $this->addFields($fields, $fieldslabel);
 	}
 
 	/**
@@ -36,23 +36,23 @@ 
 	 * @param string $multiple
 	 * @return \Ajax\common\html\HtmlDoubleElement
 	 */
-	public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){
-		return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple));
+	public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) {
+		return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple));
 	}
 
-	public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){
-		return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder));
+	public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) {
+		return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder));
 	}
 
-	public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){
-		return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick));
+	public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) {
+		return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick));
 	}
 
-	public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){
-		return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type));
+	public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) {
+		return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type));
 	}
 
-	public function addRadio($identifier, $name,$label=NULL,$value=NULL){
-		return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value));
+	public function addRadio($identifier, $name, $label=NULL, $value=NULL) {
+		return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value));
 	}
 }
\ No newline at end of file

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

Spacing +2 added lines, -2 removed lines

@@ -3,11 +3,11 @@
 namespace Ajax\semantic\html\collections\form;
 
 trait TextFieldsTrait {
-	public function setPlaceholder($value){
+	public function setPlaceholder($value) {
 		return $this->getField()->setPlaceholder($value);
 	}
 
-	public function setValue($value){
+	public function setValue($value) {
 		return $this->getField()->setValue($value);
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +25 added lines, -25 removed lines

@@ -35,8 +35,8 @@ 
 	 * @param boolean $asIcons
 	 * @return HtmlButtonGroups
 	 */
-	public function htmlButtonGroups($identifier,$elements=array(),$asIcons=false){
-		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements,$asIcons));
+	public function htmlButtonGroups($identifier, $elements=array(), $asIcons=false) {
+		return $this->addHtmlComponent(new HtmlButtonGroups($identifier, $elements, $asIcons));
 	}
 
 	/**
@@ -45,7 +45,7 @@ 
 	 * @param string $content
 	 * @return HtmlContainer
 	 */
-	public function htmlContainer($identifier,$content=""){
+	public function htmlContainer($identifier, $content="") {
 		return $this->addHtmlComponent(new HtmlContainer($identifier, $content));
 	}
 
@@ -54,8 +54,8 @@ 
 	 * @param string $content
 	 * @return HtmlDivider
 	 */
-	public function htmlDivider($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlDivider($identifier, $content,$tagName));
+	public function htmlDivider($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlDivider($identifier, $content, $tagName));
 	}
 
 	/**
@@ -65,8 +65,8 @@ 
 	 * @param string $type
 	 * @return HtmlHeader
 	 */
-	public function htmlHeader($identifier,$niveau=1,$content=NULL,$type="page"){
-		return $this->addHtmlComponent(new HtmlHeader($identifier,$niveau,$content,$type));
+	public function htmlHeader($identifier, $niveau=1, $content=NULL, $type="page") {
+		return $this->addHtmlComponent(new HtmlHeader($identifier, $niveau, $content, $type));
 	}
 
 	/**
@@ -74,7 +74,7 @@ 
 	 * @param string $icon
 	 * @return HtmlIcon
 	 */
-	public function htmlIcon($identifier,$icon){
+	public function htmlIcon($identifier, $icon) {
 		return $this->addHtmlComponent(new HtmlIcon($identifier, $icon));
 	}
 
@@ -84,14 +84,14 @@ 
 	 * @param array $icons
 	 * @return HtmlIconGroups
 	 */
-	public function htmlIconGroups($identifier,$size="",$icons=array()){
-		$group=new HtmlIconGroups($identifier,$size);
-		if(JArray::isAssociative($icons)){
-			foreach ($icons as $icon=>$size){
-				$group->add($icon,$size);
+	public function htmlIconGroups($identifier, $size="", $icons=array()) {
+		$group=new HtmlIconGroups($identifier, $size);
+		if (JArray::isAssociative($icons)) {
+			foreach ($icons as $icon=>$size) {
+				$group->add($icon, $size);
 			}
-		}else{
-			foreach ($icons as $icon){
+		}else {
+			foreach ($icons as $icon) {
 				$group->add($icon);
 			}
 		}
@@ -106,8 +106,8 @@ 
 	 * @param string $placeholder
 	 * @return HtmlInput
 	 */
-	public function htmlInput($identifier,$type="text",$value="",$placeholder=""){
-		return $this->addHtmlComponent(new HtmlInput($identifier,$type,$value,$placeholder));
+	public function htmlInput($identifier, $type="text", $value="", $placeholder="") {
+		return $this->addHtmlComponent(new HtmlInput($identifier, $type, $value, $placeholder));
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 * @param string $tagName
 	 * @return HtmlLabel
 	 */
-	public function htmlLabel($identifier,$content="",$tagName="div"){
-		return $this->addHtmlComponent(new HtmlLabel($identifier, $content,$tagName));
+	public function htmlLabel($identifier, $content="", $tagName="div") {
+		return $this->addHtmlComponent(new HtmlLabel($identifier, $content, $tagName));
 	}
 
 	/**
@@ -126,8 +126,8 @@ 
 	 * @param array $items
 	 * @return HtmlList
 	 */
-	public function htmlList($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlList($identifier,$items));
+	public function htmlList($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlList($identifier, $items));
 	}
 
 	/**
@@ -136,8 +136,8 @@ 
 	 * @param string $content
 	 * @return HtmlSegment
 	 */
-	public function htmlSegment($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlSegment($identifier,$content));
+	public function htmlSegment($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlSegment($identifier, $content));
 	}
 
 	/**
@@ -146,7 +146,7 @@ 
 	 * @param array $items the segments
 	 * @return HtmlSegmentGroups
 	 */
-	public function htmlSegmentGroups($identifier, $items=array()){
-		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier,$items));
+	public function htmlSegmentGroups($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlSegmentGroups($identifier, $items));
 	}
 }
\ No newline at end of file

Ajax/JsUtils.php

Spacing +33 added lines, -33 removed lines

@@ -25,7 +25,7 @@ 
  * JsUtils Class : Phalcon service to be injected
  */
 abstract class _JsUtils implements InjectionAwareInterface {
-	use JsUtilsEventsTrait,JsUtilsActionsTrait,JsUtilsAjaxTrait;
+	use JsUtilsEventsTrait, JsUtilsActionsTrait, JsUtilsAjaxTrait;
 
 	protected $_di;
 	protected $js;
@@ -54,7 +54,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -147,18 +147,18 @@ 
 
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery',
 				'debug' => true
 		);
-		foreach ( $defaults as $key => $val ) {
-			if (isset($params[$key])&&$params[$key]!=="") {
+		foreach ($defaults as $key => $val) {
+			if (isset($params[$key]) && $params[$key]!=="") {
 				$defaults[$key]=$params[$key];
 			}
 		}
 		extract($defaults);
 		$this->js=new Jquery($defaults);
-		$this->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -196,11 +196,11 @@ 
 	 */
 	public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) {
 		$bs=$this->_bootstrap;
-		if (isset($bs)&&isset($view)) {
+		if (isset($bs) && isset($view)) {
 			$bs->compileHtml($this, $view);
 		}
 		$sem=$this->_semantic;
-		if (isset($sem)&&isset($view)) {
+		if (isset($sem) && isset($view)) {
 			$sem->compileHtml($this, $view);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -280,27 +280,27 @@ 
 				$json_result=$result->result_array();
 			} elseif (is_array($result)) {
 				$json_result=$result;
-			} else {
+			}else {
 				return $this->_prep_args($result);
 			}
-		} else {
+		}else {
 			return 'null';
 		}
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
 	private function _create_json($json_result, $match_array_type) {
-		$json=array ();
+		$json=array();
 		$_is_assoc=TRUE;
-		if (!is_array($json_result)&&empty($json_result)) {
+		if (!is_array($json_result) && empty($json_result)) {
 			show_error("Generate JSON Failed - Illegal key, value pair.");
 		} elseif ($match_array_type) {
 			$_is_assoc=$this->_is_associative_array($json_result);
 		}
-		foreach ( $json_result as $k => $v ) {
+		foreach ($json_result as $k => $v) {
 			if ($_is_assoc) {
 				$json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			} else {
+			}else {
 				$json[]=$this->generate_json($v, $match_array_type);
 			}
 		}
@@ -315,7 +315,7 @@ 
 	 * @return type
 	 */
 	public function _is_associative_array($arr) {
-		foreach ( array_keys($arr) as $key => $val ) {
+		foreach (array_keys($arr) as $key => $val) {
 			if ($key!==$val) {
 				return TRUE;
 			}
@@ -334,11 +334,11 @@ 
 			return 'null';
 		} elseif (is_bool($result)) {
 			return ($result===TRUE) ? 'true' : 'false';
-		} elseif (is_string($result)||$is_key) {
-			return '"'.str_replace(array (
-					'\\',"\t","\n","\r",'"','/'
-			), array (
-					'\\\\','\\t','\\n',"\\r",'\"','\/'
+		} elseif (is_string($result) || $is_key) {
+			return '"'.str_replace(array(
+					'\\', "\t", "\n", "\r", '"', '/'
+			), array(
+					'\\\\', '\\t', '\\n', "\\r", '\"', '\/'
 			), $result).'"';
 		} elseif (is_scalar($result)) {
 			return $result;
@@ -351,7 +351,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -363,9 +363,9 @@ 
 		$hasJQueryUI=false;
 		$hasBootstrap=false;
 		$hasSemantic=false;
-		$result=array ();
-		foreach ( $this->cdns as $cdn ) {
-			switch(get_class($cdn)) {
+		$result=array();
+		foreach ($this->cdns as $cdn) {
+			switch (get_class($cdn)) {
 				case "Ajax\lib\CDNJQuery":
 					$hasJQuery=true;
 					$result[0]=$cdn;
@@ -375,11 +375,11 @@ 
 					$result[1]=$cdn;
 					break;
 				case "Ajax\lib\CDNCoreCss":
-					if($cdn->getFramework()==="Bootstrap")
+					if ($cdn->getFramework()==="Bootstrap")
 						$hasBootstrap=true;
-					elseif($cdn->getFramework()==="Semantic")
+					elseif ($cdn->getFramework()==="Semantic")
 						$hasSemantic=true;
-					if($hasSemantic || $hasBootstrap)
+					if ($hasSemantic || $hasBootstrap)
 						$result[2]=$cdn;
 					break;
 			}
@@ -387,14 +387,14 @@ 
 		if ($hasJQuery===false) {
 			$result[0]=new CDNJQuery("x");
 		}
-		if ($hasJQueryUI===false&&isset($this->_ui)) {
+		if ($hasJQueryUI===false && isset($this->_ui)) {
 			$result[1]=new CDNGuiGen("x", $template);
 		}
-		if ($hasBootstrap===false&&isset($this->_bootstrap)) {
-			$result[2]=new CDNCoreCss("Bootstrap","x");
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
+			$result[2]=new CDNCoreCss("Bootstrap", "x");
 		}
-		if ($hasSemantic===false&&isset($this->_semantic)) {
-			$result[2]=new CDNCoreCss("Semantic","x");
+		if ($hasSemantic===false && isset($this->_semantic)) {
+			$result[2]=new CDNCoreCss("Semantic", "x");
 		}
 		ksort($result);
 		return implode("\n", $result);
@@ -407,7 +407,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

Ajax/common/traits/JqueryActionsTrait.php

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
+		}else
 			$str="$({$element}).attr(\"$attributeName\");";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -32,7 +32,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($element='this', $value='', $immediatly=false){
+	public function after($element='this', $value='', $immediatly=false) {
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
@@ -57,7 +57,7 @@ 
 
 		$animations="\t\t\t";
 		if (is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -350,8 +350,8 @@ 
 	 * @param boolean $immediatly
 	 * @return string
 	 */
-	public 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);
+	public 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);
 	}
 
 	/**
@@ -377,8 +377,8 @@ 
 	 * @param boolean $immediatly
 	 * @return String
 	 */
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -387,8 +387,8 @@ 
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
-		if (in_array($speed, array (
-				'slow','normal','fast'
+		if (in_array($speed, array(
+				'slow', 'normal', 'fast'
 		))) {
 			$speed='"'.$speed.'"';
 		} elseif (preg_match("/[^0-9]/", $speed)) {

Ajax/common/traits/JqueryAjaxTrait.php

Spacing +36 added lines, -36 removed lines

@@ -9,12 +9,12 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -22,20 +22,20 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
 	}
 
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
-		if(JString::isNull($params)){$params="{}";}
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
+		if (JString::isNull($params)) {$params="{}"; }
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -45,22 +45,22 @@ 
 			return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
+		if (PhalconUtils::endsWith($url, "/"))
 			$slash="";
-			if(JString::isNotNull($attr)){
+			if (JString::isNotNull($attr)) {
 				if ($attr=="value")
 					$retour.="url=url+'".$slash."'+$(this).val();\n";
-					else if($attr!=null && $attr!=="")
+					else if ($attr!=null && $attr!=="")
 						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
 			}
 			return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -69,7 +69,7 @@ 
 		return $retour;
 	}
 
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -79,7 +79,7 @@ 
 	protected function _correctAjaxUrl($url) {
 		if (PhalconUtils::endsWith($url, "/"))
 			$url=substr($url, 0, strlen($url)-1);
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
 				$url=$this->_di->get("url")->get($url);
 			}
 			return $url;
@@ -93,7 +93,7 @@ 
 	 * @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) {
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -114,7 +114,7 @@ 
 	 * @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()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -124,7 +124,7 @@ 
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -136,19 +136,19 @@ 
 	 * @param string $context jquery DOM element, array container.
 	 * @param boolean $immediatly
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
-		if($context===null){
+		if ($context===null) {
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
-			$newElm = "$('#'+newId)";
-		}else{
+			$newElm="$('#'+newId)";
+		}else {
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
-			$newElm = $context.".find('#'+newId)";
+			$newElm=$context.".find('#'+newId)";
 		}
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
 		$retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n";
-		$retour.= $appendTo;
+		$retour.=$appendTo;
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -163,26 +163,26 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
 	 */
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
 		$attr="id";
 		$method="get";
-		$context = null;
+		$context=null;
 		$params="{}";
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
 		$responseElement=$this->_getResponseElement($responseElement);
 		$retour.="var self=this;\n";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -209,7 +209,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -217,7 +217,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -230,7 +230,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -238,7 +238,7 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 
 	/**
@@ -251,7 +251,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$validation=false;
@@ -260,6 +260,6 @@ 
 		$hasLoader=true;
 		$immediatly=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryEventsTrait.php

Spacing +2 added lines, -2 removed lines

@@ -4,7 +4,7 @@ 
 
 trait JqueryEventsTrait {
 	public abstract function _prep_element($element);
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
 
 	/**
 	 * Blur
@@ -46,7 +46,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}