jcheron / phalcon-jquery

Ajax/Jquery.php

Doc Comments +5 added lines, -1 removed lines

@@ -207,7 +207,7 @@ 
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
@@ -351,6 +351,7 @@ 
 	/**
 	 * A wrapper for writing document.ready()
 	 *
+	 * @param string $js
 	 * @return string
 	 */
 	public function _document_ready($js) {
@@ -420,6 +421,9 @@ 
 		return $speed;
 	}
 
+	/**
+	 * @param string $input
+	 */
 	private function minify($input) {
 	if(trim($input) === "") return $input;
 	return preg_replace(

Braces +23 added lines, -15 removed lines

@@ -173,10 +173,12 @@ 
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
-			$str="$({$element}).{$jQueryCall}();";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).{$jQueryCall}();";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 			return $str;
 	}
 	/**
@@ -191,8 +193,9 @@ 
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 	// --------------------------------------------------------------------
@@ -260,12 +263,14 @@ 
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-		else
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
-			$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		}
+		if($immediatly) {
+					$this->jquery_code_for_compile[]=$event;
+		}
 		return $event;
 	}
 
@@ -326,8 +331,9 @@ 
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!=NULL)
-			$view->setVar($view_var, $output);
+		if ($view!=NULL) {
+					$view->setVar($view_var, $output);
+		}
 		return $output;
 	}
 
@@ -421,7 +427,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)

Spacing +24 added lines, -24 removed lines

@@ -17,21 +17,21 @@ 
  * jQuery Class
  */
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_di;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 
-	protected $jquery_events=array (
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
+	protected $jquery_events=array(
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
 	);
 
 	public function setDi($di) {
@@ -61,7 +61,7 @@ 
 
 	public function __construct($params) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 	}
@@ -135,12 +135,12 @@ 
 	 */
 	public function _output($array_js='') {
 		if (!is_array($array_js)) {
-			$array_js=array (
+			$array_js=array(
 					$array_js
 			);
 		}
 
-		foreach ( $array_js as $js ) {
+		foreach ($array_js as $js) {
 			$this->jquery_code_for_compile[]="\t$js\n";
 		}
 	}
@@ -152,12 +152,12 @@ 
 	 * @param string $param
 	 * @param boolean $immediatly delayed if false
 	 */
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
 		$element=$this->_prep_element($element);
 		if (isset($param)) {
 			$param=$this->_prep_value($param);
 			$str="$({$element}).{$jQueryCall}({$param});";
-		} else
+		}else
 			$str="$({$element}).{$jQueryCall}();";
 			if ($immediatly)
 				$this->jquery_code_for_compile[]=$str;
@@ -171,7 +171,7 @@ 
 	 * @param boolean $immediatly delayed if false
 	 * @return string
 	 */
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -189,12 +189,12 @@ 
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
-			$sort_options=array ();
-			foreach ( $options as $k => $v ) {
+			$sort_options=array();
+			foreach ($options as $k => $v) {
 				$sort_options[]="\n\t\t".$k.': '.$v."";
 			}
 			$sort_options=implode(",", $sort_options);
-		} else {
+		}else {
 			$sort_options='';
 		}
 
@@ -222,7 +222,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -236,7 +236,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -276,7 +276,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -291,7 +291,7 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
@@ -311,7 +311,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -320,12 +320,12 @@ 
 	 */
 	public function _document_ready($js) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
 
-		foreach ( $js as $script ) {
+		foreach ($js as $script) {
 			$this->jquery_code_for_compile[]=$script;
 		}
 	}
@@ -339,7 +339,7 @@ 
 	 * @return string
 	 */
 	public function _prep_element($element) {
-		if (strrpos($element, 'this')===false&&strrpos($element, 'event')===false&&strrpos($element, 'self')===false) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===false && strrpos($element, 'self')===false) {
 			$element='"'.addslashes($element).'"';
 		}
 		return $element;
@@ -357,14 +357,14 @@ 
 		if (is_array($value)) {
 			$value=implode(",", $value);
 		}
-		if (strrpos($value, 'this')===false&&strrpos($value, 'event')===false&&strrpos($value, 'self')===false) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===false && strrpos($value, 'self')===false) {
 			$value='"'.$value.'"';
 		}
 		return $value;
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/Semantic.php

Doc Comments -1 removed lines

@@ -93,7 +93,6 @@
 	/**
 	 * Return a new Semantic Html Breadcrumb
 	 * @param string $identifier
-	 * @param array $elements
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true. default : true
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumb

Spacing +21 added lines, -21 removed lines

@@ -20,7 +20,7 @@ 
 use Ajax\semantic\traits\SemanticHtmlElementsTrait;
 
 class Semantic extends BaseGui {
-	use SemanticComponentsTrait,SemanticHtmlElementsTrait;
+	use SemanticComponentsTrait, SemanticHtmlElementsTrait;
 	public function __construct($autoCompile=true) {
 		parent::__construct($autoCompile=true);
 	}
@@ -31,24 +31,24 @@ 
 	 * @param array $items
 	 * @return Ajax\semantic\html\collections\HtmlMenu
 	 */
-	public function htmlMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlMenu($identifier,$items));
+	public function htmlMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlMenu($identifier, $items));
 	}
 
 	/**Adds an icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlIconMenu($identifier,$items));
+	public function htmlIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlIconMenu($identifier, $items));
 	}
 
 	/**Adds an labeled icon menu
 	 * @param string $identifier
 	 * @param array $items icons
 	 */
-	public function htmlLabeledIconMenu($identifier,$items=array()){
-		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier,$items));
+	public function htmlLabeledIconMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlLabeledIconMenu($identifier, $items));
 	}
 
 	/**
@@ -56,8 +56,8 @@ 
 	 * @param string $value
 	 * @param array $items
 	 */
-	public function htmlDropdown($identifier, $value="", $items=array()){
-		return $this->addHtmlComponent(new HtmlDropdown($identifier,$value,$items));
+	public function htmlDropdown($identifier, $value="", $items=array()) {
+		return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items));
 	}
 
 	/**
@@ -65,16 +65,16 @@ 
 	 * @param string $identifier
 	 * @param string $content
 	 */
-	public function htmlMessage($identifier, $content=""){
-		return $this->addHtmlComponent(new HtmlMessage($identifier,$content));
+	public function htmlMessage($identifier, $content="") {
+		return $this->addHtmlComponent(new HtmlMessage($identifier, $content));
 	}
 
 	/**
 	 * @param string $identifier
 	 * @param mixed $content
 	 */
-	public function htmlPopup(BaseHtml $container,$identifier,$content){
-		return $this->addHtmlComponent(new HtmlPopup($container,$identifier,$content));
+	public function htmlPopup(BaseHtml $container, $identifier, $content) {
+		return $this->addHtmlComponent(new HtmlPopup($container, $identifier, $content));
 	}
 
 	/**
@@ -84,8 +84,8 @@ 
 	 * @param boolean $createCols
 	 * @param boolean $implicitRows
 	 */
-	public function htmlGrid($identifier,$numRows=1,$numCols=NULL,$createCols=true,$implicitRows=false){
-		return $this->addHtmlComponent(new HtmlGrid($identifier,$numRows,$numCols,$createCols,$implicitRows));
+	public function htmlGrid($identifier, $numRows=1, $numCols=NULL, $createCols=true, $implicitRows=false) {
+		return $this->addHtmlComponent(new HtmlGrid($identifier, $numRows, $numCols, $createCols, $implicitRows));
 	}
 
 
@@ -98,8 +98,8 @@ 
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumb
 	 */
-	public function htmlBreadcrumb( $identifier,$items=array(),$autoActive=true,$startIndex=0,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumb($identifier,$items,$autoActive,$startIndex,$hrefFunction));
+	public function htmlBreadcrumb($identifier, $items=array(), $autoActive=true, $startIndex=0, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumb($identifier, $items, $autoActive, $startIndex, $hrefFunction));
 	}
 
 	/**
@@ -116,8 +116,8 @@ 
 	 * @param string $identifier
 	 * @return HtmlAccordion
 	 */
-	public function htmlAccordionMenu($identifier,$items=array()) {
-		return $this->addHtmlComponent(new HtmlAccordionMenu($identifier,$items));
+	public function htmlAccordionMenu($identifier, $items=array()) {
+		return $this->addHtmlComponent(new HtmlAccordionMenu($identifier, $items));
 	}
 
 	/**
@@ -125,7 +125,7 @@ 
 	 * @param string $identifier
 	 * @param array $elements
 	 */
-	public function htmlForm($identifier,$elements=array()) {
-		return $this->addHtmlComponent(new HtmlForm($identifier,$elements));
+	public function htmlForm($identifier, $elements=array()) {
+		return $this->addHtmlComponent(new HtmlForm($identifier, $elements));
 	}
 }
\ No newline at end of file

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Doc Comments +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 
 	/**
 	 * @param string $identifier
-	 * @param number $niveau
+	 * @param integer $niveau
 	 * @param mixed $content
 	 * @param string $type
 	 * @return HtmlHeader

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

Braces +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 			foreach ($icons as $icon=>$size){
 				$group->addIcon($icon,$size);
 			}
-		}else{
+		} else{
 			foreach ($icons as $icon){
 				$group->addIcon($icon);
 			}

Ajax/common/traits/JqueryActionsTrait.php

Braces +51 added lines, -34 removed lines

@@ -16,10 +16,12 @@ 
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
-		} else
-			$str="$({$element}).attr(\"$attributeName\");";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).attr(\"$attributeName\");";
+		}
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$str;
+			}
 				return $str;
 	}
 
@@ -34,8 +36,9 @@ 
 		$element=$this->_prep_element($element);
 		$value=$this->_prep_value($value);
 		$str="$({$element}).after({$value});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -71,8 +74,9 @@ 
 
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -97,8 +101,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -123,8 +128,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -149,8 +155,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -177,8 +184,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -203,8 +211,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -229,8 +238,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -247,8 +257,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).toggle();";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -264,8 +275,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).trigger(\"$event\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -290,8 +302,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -309,8 +322,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 			return $str;
 	}
 
@@ -327,11 +341,13 @@ 
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
 		$param=$this->_prep_value($param);
 		$callback="";
-		if ($jsCallback!="")
-			$callback=", function(event){\n{$jsCallback}\n}";
+		if ($jsCallback!="") {
+					$callback=", function(event){\n{$jsCallback}\n}";
+		}
 			$script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
-			if ($immediatly)
-				$this->jquery_code_for_compile[]=$script;
+			if ($immediatly) {
+							$this->jquery_code_for_compile[]=$script;
+			}
 				return $script;
 	}
 
@@ -360,8 +376,9 @@ 
 	 */
 	public function _exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 			return $script;
 	}
 

Doc Comments +5 added lines, -1 removed lines

@@ -3,6 +3,10 @@ 
 namespace Ajax\common\traits;
 
 trait JqueryActionsTrait {
+
+	/**
+	 * @param string $element
+	 */
 	public abstract function _prep_element($element);
 	public abstract function _prep_value($value);
 
@@ -383,7 +387,7 @@ 
 
 	/**
 	 * Ensures the speed parameter is valid for jQuery
-	 * @param string|int $speed
+	 * @param string $speed
 	 * @return string
 	 */
 	private function _validate_speed($speed) {

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/JsUtilsAjaxTrait.php

Spacing +19 added lines, -19 removed lines

@@ -17,8 +17,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -29,8 +29,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);
 	}
 
 	/**
@@ -40,8 +40,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);
 	}
 
 	/**
@@ -85,8 +85,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","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);
 	}
 
 	/**
@@ -98,7 +98,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $attr the html attribute added to the request
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
 	}
 
@@ -136,8 +136,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -150,8 +150,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -165,7 +165,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
 	 */
 	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);
 	}
 
 	/**
@@ -189,8 +189,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -203,8 +203,8 @@ 
 	 * @param string $attr the html attribute added to the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -218,7 +218,7 @@ 
 	 * @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()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**

Ajax/common/traits/JsUtilsActionsTrait.php

Spacing +14 added lines, -14 removed lines

@@ -13,7 +13,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -23,8 +23,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
 	}
 
 	/**
@@ -34,8 +34,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
 	}
 
 	/**
@@ -55,8 +55,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -66,7 +66,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
 	}
 
 	/**
@@ -91,7 +91,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -102,7 +102,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 
 	/**
@@ -153,7 +153,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -214,7 +214,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -290,7 +290,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
 	}
 
 	/**
@@ -317,7 +317,7 @@ 
 		$preventDefault=false;
 		$immediatly=true;
 		extract($parameters);
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
 		return $script;
 	}
 }
\ No newline at end of file

Ajax/common/traits/JqueryAjaxTrait.php

Braces +24 added lines, -17 removed lines

@@ -35,8 +35,9 @@ 
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 
@@ -44,13 +45,15 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		$slash="/";
-		if(PhalconUtils::endsWith($url, "/"))
-			$slash="";
+		if(PhalconUtils::endsWith($url, "/")) {
+					$slash="";
+		}
 			if(JString::isNotNull($attr)){
-				if ($attr=="value")
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
-					else if($attr!=null && $attr!=="")
-						$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+				if ($attr=="value") {
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
+				} else if($attr!=null && $attr!=="") {
+											$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
+					}
 			}
 			return $retour;
 	}
@@ -72,8 +75,9 @@ 
 	}
 
 	protected function _correctAjaxUrl($url) {
-		if (PhalconUtils::endsWith($url, "/"))
-			$url=substr($url, 0, strlen($url)-1);
+		if (PhalconUtils::endsWith($url, "/")) {
+					$url=substr($url, 0, strlen($url)-1);
+		}
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
 				$url=$this->_di->get("url")->get($url);
 			}
@@ -97,8 +101,9 @@ 
 				$retour.="\t".$jsCallback."\n".
 						"\t$(document).trigger('jsonReady',[data]);\n".
 						"});\n";
-				if ($immediatly)
-					$this->jquery_code_for_compile[]=$retour;
+				if ($immediatly) {
+									$this->jquery_code_for_compile[]=$retour;
+				}
 					return $retour;
 	}
 
@@ -137,7 +142,7 @@ 
 		if($context===null){
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
 			$newElm = "$('#'+newId)";
-		}else{
+		} else{
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
 			$newElm = $context.".find('#'+newId)";
 		}
@@ -147,8 +152,9 @@ 
 		$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";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 	/**
@@ -189,8 +195,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 			return $retour;
 	}
 

Doc Comments +28 added lines

@@ -9,7 +9,17 @@ 
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
 
 	public abstract function _prep_value($value);
+
+	/**
+	 * @param string $element
+	 * @param string $js
+	 * @param string $event
+	 */
 	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
+
+	/**
+	 * @param string $retour
+	 */
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -22,13 +32,23 @@ 
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
 	}
 
+	/**
+	 * @param string $url
+	 */
 	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);
 	}
+
+	/**
+	 * @param string $url
+	 */
 	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);
 	}
 
+	/**
+	 * @param string $method
+	 */
 	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
 		if(JString::isNull($params)){$params="{}";}
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
@@ -45,6 +65,9 @@ 
 			return $retour;
 	}
 
+	/**
+	 * @param string $attr
+	 */
 	protected function _getAjaxUrl($url,$attr){
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
@@ -176,6 +199,11 @@ 
 		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $form
+	 * @param string $responseElement
+	 */
 	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);

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/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

Braces +20 added lines, -13 removed lines

@@ -29,8 +29,9 @@ 
 
 	public function addHeader($title,$niveau=1,$dividing=true){
 		$header=new HtmlHeader("",$niveau,$title);
-		if($dividing)
-			$header->setDividing();
+		if($dividing) {
+					$header->setDividing();
+		}
 		return $this->addItem($header);
 	}
 
@@ -43,14 +44,17 @@ 
 					if(\is_string($end)){
 						$label=$end;
 						\array_pop($fields);
-					}else $label=NULL;
+					} else {
+						$label=NULL;
+					}
 				}
 				$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);
@@ -68,7 +72,7 @@ 
 	public function getField($index){
 		if(\is_string($index)){
 			$field=$this->getElementById($index, $this->_fields);
-		}else{
+		} else{
 			$field=$this->_fields[$index];
 		}
 		return $field;
@@ -101,12 +105,15 @@ 
 	 */
 	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))
-			$message->setIcon($icon);
-		if(isset($type))
-			$message->setStyle($type);
+		if(isset($header)) {
+					$message->addHeader($header);
+		}
+		if(isset($icon)) {
+					$message->setIcon($icon);
+		}
+		if(isset($type)) {
+					$message->setStyle($type);
+		}
 		return $this->addItem($message);
 	}
 

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

Braces +3 added lines, -2 removed lines

@@ -13,8 +13,9 @@
 		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);
+		} else {
+					return new HtmlFormInput($value);
+		}
 	}
 
 	public function addInputs($inputs,$fieldslabel=null){