jcheron / phalcon-jquery

Ajax/bootstrap/html/HtmlTabs.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
+	/**
+	 * @param string $identifier
+	 */
 	public function __construct($identifier, $tagName="ul") {
 		parent::__construct($identifier, $tagName);
 		$this->_template="<%tagName% %properties%>%tabs%</%tagName%>%content%";

Spacing +18 added lines, -18 removed lines

@@ -16,7 +16,7 @@ 
 use Phalcon\Mvc\View;
 
 class HtmlTabs extends HtmlDoubleElement {
-	protected $tabs=array ();
+	protected $tabs=array();
 	protected $_tabsType="tabs";
 	protected $stacked="";
 
@@ -27,25 +27,25 @@ 
 	}
 
 	protected function addTab_($tab, $index=null) {
-		if($tab instanceof HtmlDropdown){
+		if ($tab instanceof HtmlDropdown) {
 			$tab->setMTagName("li");
 		}
 		if (isset($index)) {
-			$inserted=array (
+			$inserted=array(
 					$tab
 			);
 			array_splice($this->tabs, $index, 0, $inserted);
-		} else
+		}else
 			$this->tabs []=$tab;
 	}
 
-	public function setActive($index){
-		for ($i=0;$i<sizeof($this->tabs);$i++){
+	public function setActive($index) {
+		for ($i=0; $i<sizeof($this->tabs); $i++) {
 			$this->tabs[$i]->setActive($i==$index);
 		}
 	}
 
-	public function disable($index){
+	public function disable($index) {
 		$this->tabs[$index]->disable();
 	}
 
@@ -59,7 +59,7 @@ 
 			$tab=new HtmlTabItem("tab-".$this->identifier."-".$iid);
 			$tab->fromArray($element);
 			$this->addTab_($tab, $index);
-		} else {
+		}else {
 			$this->addTab_($tab, $index);
 		}
 		return $tab;
@@ -76,7 +76,7 @@ 
 	}
 
 	public function addTabs($tabs) {
-		foreach ( $tabs as $tab ) {
+		foreach ($tabs as $tab) {
 			$this->addTab($tab);
 		}
 		return $this;
@@ -106,7 +106,7 @@ 
 	 */
 	public function run(JsUtils $js) {
 		$this->_bsComponent=new Tabs($js);
-		foreach ( $this->tabs as $tab ) {
+		foreach ($this->tabs as $tab) {
 			$this->_bsComponent->addTab($tab->run($js));
 		}
 		$this->addEventsOnRun($js);
@@ -115,11 +115,11 @@ 
 
 	public function createTabContents() {
 		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier);
-		foreach ( $this->tabs as $tab ) {
+		foreach ($this->tabs as $tab) {
 			if ($tab instanceof HtmlTabItem)
 				$tabContent->addTabItem($tab->getHref());
 			elseif ($tab instanceof HtmlDropdown) {
-				foreach ( $tab->getItems() as $dropdownItem ) {
+				foreach ($tab->getItems() as $dropdownItem) {
 					$tabContent->addTabItem($dropdownItem->getHref());
 				}
 			}
@@ -154,21 +154,21 @@ 
 		if (sizeof($this->content->getTabItems())>0) {
 			$this->content->getTabItem(0)->addToProperty("class", "fade in");
 			$size=sizeof($this->tabs);
-			for($index=0; $index<$size; $index++) {
+			for ($index=0; $index<$size; $index++) {
 				$this->content->getTabItem($index)->addToProperty("class", "fade");
 			}
 		}
 	}
 	
-	public function on($event, $jsCode,$stopPropagation=false,$preventDefault=false){
-		foreach ($this->tabs as $tab){
-			$tab->on($event,$jsCode,$stopPropagation,$preventDefault);
+	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
+		foreach ($this->tabs as $tab) {
+			$tab->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 
-	public function setStacked($stacked=true){
-		if($stacked)
+	public function setStacked($stacked=true) {
+		if ($stacked)
 			$this->stacked="nav-stacked";
 		else $this->stacked="";
 	}

Braces +17 added lines, -12 removed lines

@@ -35,8 +35,9 @@ 
 					$tab
 			);
 			array_splice($this->tabs, $index, 0, $inserted);
-		} else
-			$this->tabs []=$tab;
+		} else {
+					$this->tabs []=$tab;
+		}
 	}
 
 	public function setActive($index){
@@ -116,9 +117,9 @@ 
 	public function createTabContents() {
 		$tabContent=new HtmlTabContent("tabcontent-".$this->identifier);
 		foreach ( $this->tabs as $tab ) {
-			if ($tab instanceof HtmlTabItem)
-				$tabContent->addTabItem($tab->getHref());
-			elseif ($tab instanceof HtmlDropdown) {
+			if ($tab instanceof HtmlTabItem) {
+							$tabContent->addTabItem($tab->getHref());
+			} elseif ($tab instanceof HtmlDropdown) {
 				foreach ( $tab->getItems() as $dropdownItem ) {
 					$tabContent->addTabItem($dropdownItem->getHref());
 				}
@@ -137,8 +138,9 @@ 
 
 	public function setContentToTab($index, $text) {
 		$tabContentItem=$this->content->getTabItem($index);
-		if (isset($tabContentItem))
-			$tabContentItem->setContent($text);
+		if (isset($tabContentItem)) {
+					$tabContentItem->setContent($text);
+		}
 	}
 
 	public function countTabs() {
@@ -146,8 +148,9 @@ 
 	}
 
 	public function getTabItem($index) {
-		if ($index<sizeof($this->content->get))
-			return $this->content;
+		if ($index<sizeof($this->content->get)) {
+					return $this->content;
+		}
 	}
 
 	public function fadeEffect() {
@@ -168,9 +171,11 @@ 
 	}
 
 	public function setStacked($stacked=true){
-		if($stacked)
-			$this->stacked="nav-stacked";
-		else $this->stacked="";
+		if($stacked) {
+					$this->stacked="nav-stacked";
+		} else {
+			$this->stacked="";
+		}
 	}
 
 	/* (non-PHPdoc)

Ajax/bootstrap/html/phalcon/PhBsSelect.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ajax\bootstrap\html\phalcon\PhBsElement;
 use Phalcon\Forms\Element\Select;
-use Ajax\bootstrap\html\base\HtmlDoubleElement;
 use Ajax\bootstrap\html\html5\HtmlSelect;
 
 class PhBsSelect extends PhBsElement {

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 		parent::__construct($name, $attributes);
 		$list=new HtmlSelect($name);
 		$list->setTagName("select");
-		$this->renderer=new PhBsRenderer(new Select($name, array (), $attributes), $list);
+		$this->renderer=new PhBsRenderer(new Select($name, array(), $attributes), $list);
 		$this->setOptions($options);
 	}
 

Ajax/Jquery.php

Doc Comments +32 added lines, -4 removed lines

@@ -155,7 +155,7 @@ 
 	 * Outputs a jQuery click event
 	 *
 	 * @param string $element The element to attach the event to
-	 * @param mixed $js The code to execute
+	 * @param string $js The code to execute
 	 * @param boolean $ret_false whether or not to return false
 	 * @return string
 	 */
@@ -220,6 +220,8 @@ 
 	 * @param string - element
 	 * @param string - Javascript code for mouse over
 	 * @param string - Javascript code for mouse out
+	 * @param string $over
+	 * @param string $out
 	 * @return string
 	 */
 	public function _hover($element='this', $over, $out) {
@@ -803,7 +805,7 @@ 
 	 *
 	 * @param string $element
 	 * @param array $options
-	 * @return void
+	 * @return string
 	 */
 	public function sortable($element, $options=array()) {
 		if (count($options)>0) {
@@ -934,6 +936,7 @@ 
 	/**
 	 * A wrapper for writing document.ready()
 	 *
+	 * @param string $js
 	 * @return string
 	 */
 	public function _document_ready($js) {
@@ -988,7 +991,7 @@ 
 	/**
 	 * Ensures the speed parameter is valid for jQuery
 	 *
-	 * @param string|int $speed
+	 * @param string $speed
 	 * @return string
 	 */
 	private function _validate_speed($speed) {
@@ -1003,6 +1006,10 @@ 
 		return $speed;
 	}
 	// ------------------------------------------------------------------------
+
+	/**
+	 * @param string $retour
+	 */
 	protected function addLoading(&$retour, $responseElement) {
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
@@ -1015,13 +1022,25 @@ 
 		$retour.="\t\t$(\"{$responseElement}\").prepend('{$loading_notifier}');\n";
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $jsCallback
+	 */
 	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
+	 * @param string $jsCallback
+	 */
 	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 : "";
@@ -1036,6 +1055,9 @@ 
 		return $retour;
 	}
 
+	/**
+	 * @param string $attr
+	 */
 	protected function _getAjaxUrl($url,$attr){
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
@@ -1105,6 +1127,12 @@ 
 		return $retour;
 	}
 
+	/**
+	 * @param string $url
+	 * @param string $form
+	 * @param string $responseElement
+	 * @param string $jsCallback
+	 */
 	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);
@@ -1212,7 +1240,7 @@ 
 	 * @param string $element
 	 * @param string $elementToModify
 	 * @param string $jqueryCall
-	 * @param string|array $param
+	 * @param string $param
 	 * @param boolean $preventDefault
 	 * @param boolean $stopPropagation
 	 * @param string $jsCallback javascript code to execute after the jquery call

Braces +92 added lines, -63 removed lines

@@ -420,8 +420,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;
 	}
 	
@@ -437,10 +438,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;
 	}
 
@@ -456,10 +459,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;
 	}
 	/**
@@ -474,8 +479,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;
 	}
 	// --------------------------------------------------------------------
@@ -512,8 +518,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;
 	}
 
@@ -538,8 +545,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -564,8 +572,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -590,8 +599,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -618,8 +628,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -644,8 +655,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -670,8 +682,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -688,8 +701,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;
 	}
 
@@ -705,8 +719,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;
 	}
 
@@ -731,8 +746,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -750,8 +766,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -817,10 +834,11 @@ 
 		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 (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";
+		}
 		$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -870,8 +888,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;
 	}
 
@@ -994,8 +1013,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;
 	}
 
@@ -1003,13 +1023,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;
 	}
@@ -1031,8 +1053,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);
 		}
@@ -1054,8 +1077,9 @@ 
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
 		$retour.="\t".$jsCallback."\n
 		});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 	
@@ -1092,7 +1116,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)";
 		}
@@ -1102,8 +1126,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".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 	/**
@@ -1143,8 +1168,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1220,11 +1246,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;
 	}
 
@@ -1252,8 +1280,9 @@ 
 	 */
 	public function _exec($js, $immediatly=false) {
 		$script=$js."\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$script;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$script;
+		}
 		return $script;
 	}
 

Spacing +59 added lines, -59 removed lines

@@ -21,14 +21,14 @@ 
 	protected $_bootstrap;
 	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 $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
-	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) {
@@ -161,7 +161,7 @@ 
 	 */
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
 		if (!is_array($js)) {
-			$js=array (
+			$js=array(
 					$js
 			);
 		}
@@ -356,12 +356,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";
 		}
 	}
@@ -416,7 +416,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});";
@@ -437,7 +437,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;
@@ -451,12 +451,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;
@@ -470,7 +470,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});";
@@ -496,7 +496,7 @@ 
 
 		$animations="\t\t\t";
 		if (is_array($params)) {
-			foreach ( $params as $param => $value ) {
+			foreach ($params as $param => $value) {
 				$animations.=$param.': \''.$value.'\', ';
 			}
 		}
@@ -768,12 +768,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='';
 		}
 
@@ -854,7 +854,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -887,7 +887,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	// --------------------------------------------------------------------
@@ -899,12 +899,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;
 		}
 	}
@@ -920,7 +920,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;
@@ -938,7 +938,7 @@ 
 		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;
@@ -953,8 +953,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)) {
@@ -968,7 +968,7 @@ 
 		$loading_notifier='<div class="ajax-loader">';
 		if ($this->ajaxLoader=='') {
 			$loading_notifier.="Loading...";
-		} else {
+		}else {
 			$loading_notifier.=$this->ajaxLoader;
 		}
 		$loading_notifier.='</div>';
@@ -976,20 +976,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";
@@ -999,22 +999,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";
@@ -1023,7 +1023,7 @@ 
 		return $retour;
 	}
 	
-	protected function _getResponseElement($responseElement){
+	protected function _getResponseElement($responseElement) {
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
 		}
@@ -1033,7 +1033,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;
@@ -1046,7 +1046,7 @@ 
 	 * @param string $method Method use
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
-	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";
@@ -1066,7 +1066,7 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -1075,7 +1075,7 @@ 
 		$context="document";
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1086,19 +1086,19 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $context jquery DOM element, array container.
 	 */
-	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".$jsCallback."\n"."});\n";
@@ -1113,25 +1113,25 @@ 
 	 * @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="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation);
 	}
 	
-	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";
@@ -1158,14 +1158,14 @@ 
 	 * @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;
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1178,14 +1178,14 @@ 
 	 * @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;
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**
@@ -1198,7 +1198,7 @@ 
 	 * @param string $responseElement
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>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;
@@ -1206,7 +1206,7 @@ 
 		$attr="id";
 		$hasLoader=true;
 		extract($parameters);
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation);
 	}
 
 	/**

Ajax/JsUtils.php

Doc Comments +6 added lines, -3 removed lines

@@ -676,6 +676,9 @@ 
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
+	/**
+	 * @param boolean $match_array_type
+	 */
 	private function _create_json($json_result, $match_array_type) {
 		$json=array ();
 		$_is_assoc=TRUE;
@@ -699,7 +702,7 @@ 
 	 * Checks for an associative array
 	 *
 	 * @param type
-	 * @return type
+	 * @return boolean
 	 */
 	public function _is_associative_array($arr) {
 		foreach ( array_keys($arr) as $key => $val ) {
@@ -939,7 +942,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->js->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
@@ -951,7 +954,7 @@ 
 	 * @param string $jqueryCall the JQuery callback
 	 * @param mixed $param array or string parameters
 	 * @param string $jsCallback javascript code to execute after the jquery call
-	 * @return mixed
+	 * @return string
 	 */
 	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
 		return $this->js->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,9 @@
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
-			$this->js->setDi($di);
+		if ($this->js!=null&&$di!=null) {
+					$this->js->setDi($di);
+		}
 	}
 
 	/**

Spacing +56 added lines, -56 removed lines

@@ -45,7 +45,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -120,17 +120,17 @@ 
 	}
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery'
 		);
-		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();
-		$this->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -382,7 +382,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);
 	}
 	
 	/**
@@ -392,8 +392,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);
 	}
 	
 	/**
@@ -403,8 +403,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);
 	}
 	
 	/**
@@ -424,8 +424,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);
 	}
 
 	/**
@@ -435,7 +435,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -460,7 +460,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);
 	}
 
 	/**
@@ -471,7 +471,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -522,7 +522,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);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -583,7 +583,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);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 */
 	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);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -710,27 +710,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);
 			}
 		}
@@ -745,7 +745,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;
 			}
@@ -764,11 +764,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;
@@ -783,8 +783,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);
 	}
 
 	/**
@@ -794,8 +794,8 @@ 
 	 * @param string $method Method used
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
-	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);
 	}
 
 	/**
@@ -805,8 +805,8 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	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);
 	}
 	
 	/**
@@ -850,8 +850,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	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);
 	}
 
 	/**
@@ -863,7 +863,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);
 	}
 
@@ -901,8 +901,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);
 	}
 
 	/**
@@ -915,8 +915,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);
 	}
 
 	/**
@@ -930,7 +930,7 @@ 
 	 * @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()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -954,8 +954,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);
 	}
 
 	/**
@@ -968,8 +968,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);
 	}
 
 	/**
@@ -983,7 +983,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>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);
 	}
 
 	/**
@@ -1073,7 +1073,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -1084,9 +1084,9 @@ 
 		$hasJQuery=false;
 		$hasJQueryUI=false;
 		$hasBootstrap=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;
@@ -1104,10 +1104,10 @@ 
 		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)) {
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
 			$result[2]=new CDNBootstrap("x");
 		}
 		ksort($result);
@@ -1121,7 +1121,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

Ajax/bootstrap/components/Collapse.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 	}
 
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
+		foreach ($this->events as $event => $jsCode) {
 			$this->jquery_code_for_compile []="$( \"".$this->collapsed."\" ).on(\"".$event."\" , function (e) {".$jsCode."});";
 		}
 	}

Ajax/bootstrap/components/GenericComponent.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 	 * @see \Ajax\bootstrap\components\SimpleBsComponent::getScript()
 	 */
 	public function getScript() {
-		$this->jquery_code_for_compile=array ();
-		foreach ( $this->jsCodes as $jsCode ) {
-			$this->jquery_code_for_compile []=$jsCode->compile(array (
+		$this->jquery_code_for_compile=array();
+		foreach ($this->jsCodes as $jsCode) {
+			$this->jquery_code_for_compile []=$jsCode->compile(array(
 					"identifier" => $this->attachTo 
 			));
 		}

Ajax/bootstrap/components/Modal.php

Spacing +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
 		if ($value) {
 			$this->jsCodes ["draggable"]=new Draggable();
 			$this->setBackdrop(false);
-		} else if (array_key_exists("draggable", $this->jsCodes)) {
+		}else if (array_key_exists("draggable", $this->jsCodes)) {
 			unset($this->jsCodes ["draggable"]);
 			unset($this->params ["backdrop"]);
 		}

Ajax/bootstrap/components/SimpleBsComponent.php

Spacing +4 added lines, -4 removed lines

@@ -6,8 +6,8 @@ 
 use Ajax\common\JsCode;
 
 class SimpleBsComponent extends SimpleComponent {
-	protected $events=array ();
-	protected $jsCodes=array ();
+	protected $events=array();
+	protected $jsCodes=array();
 
 	public function addEvent($event, $jsCode) {
 		$this->events [$event]=$jsCode;
@@ -15,8 +15,8 @@ 
 
 	public function getScript() {
 		parent::getScript();
-		foreach ( $this->jsCodes as $jsCode ) {
-			$this->jquery_code_for_compile []=$jsCode->compile(array (
+		foreach ($this->jsCodes as $jsCode) {
+			$this->jquery_code_for_compile []=$jsCode->compile(array(
 					"identifier" => $this->attachTo 
 			));
 		}

Ajax/bootstrap/components/Splitbutton.php

Spacing +2 added lines, -2 removed lines

@@ -9,10 +9,10 @@
 	 * @see \Ajax\common\SimpleComponent::compileEvents()
 	 */
 	protected function compileEvents() {
-		foreach ( $this->events as $event => $jsCode ) {
+		foreach ($this->events as $event => $jsCode) {
 			if ($event==="buttonClick") {
 				$this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});";
-			} else {
+			}else {
 				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
 			}
 		}