jcheron / phalcon-jquery

Ajax/Bootstrap.php

Spacing +9 added lines, -9 removed lines

@@ -268,8 +268,8 @@ 
 	 * @param string $tagName container tagName
 	 * @return HtmlListgroup
 	 */
-	public function htmlListgroup($identifier,$items=array(),$tagName="ul"){
-		$listGroup=new HtmlListgroup($identifier,$tagName);
+	public function htmlListgroup($identifier, $items=array(), $tagName="ul") {
+		$listGroup=new HtmlListgroup($identifier, $tagName);
 		$listGroup->addItems($items);
 		return $this->addHtmlComponent($listGroup);
 	}
@@ -294,8 +294,8 @@ 
 	 * @param string $onClick
 	 * @return HtmlSplitbutton
 	 */
-	public function htmlSplitbutton($identifier,$value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
-		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle,$onClick));
+	public function htmlSplitbutton($identifier, $value="", $items=array(), $cssStyle="btn-default", $onClick=NULL) {
+		return $this->addHtmlComponent(new HtmlSplitbutton($identifier, $value, $items, $cssStyle, $onClick));
 	}
 
 	/**
@@ -303,7 +303,7 @@ 
 	 * @param string $identifier
 	 * @return HtmlInputgroup
 	 */
-	public function htmlInputgroup($identifier){
+	public function htmlInputgroup($identifier) {
 		return $this->addHtmlComponent(new HtmlInputgroup($identifier));
 	}
 	
@@ -315,8 +315,8 @@ 
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 * @return HtmlBreadcrumbs
 	 */
-	public function htmlBreadcrumbs($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){
-		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier,$elements,$autoActive,$hrefFunction));
+	public function htmlBreadcrumbs($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) {
+		return $this->addHtmlComponent(new HtmlBreadcrumbs($identifier, $elements, $autoActive, $hrefFunction));
 	}
 	
 	/**
@@ -328,7 +328,7 @@ 
 	 * @param int $active The active page
 	 * @return HtmlPagination
 	 */
-	public function htmlPagination($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		return $this->addHtmlComponent(new HtmlPagination($identifier,$from,$to,$active,$countVisible));
+	public function htmlPagination($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		return $this->addHtmlComponent(new HtmlPagination($identifier, $from, $to, $active, $countVisible));
 	}
 }
\ No newline at end of file

Ajax/Jquery.php

Spacing +51 added lines, -51 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) {
+		if (strrpos($element, 'this')===false && strrpos($element, 'event')===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) {
+		if (strrpos($value, 'this')===false && strrpos($value, 'event')===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,18 +976,18 @@ 
 		$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);
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -997,19 +997,19 @@ 
 		return $retour;
 	}
 
-	protected function _getAjaxUrl($url,$attr){
+	protected function _getAjaxUrl($url, $attr) {
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
-		if(JString::isNotNull($attr)){
+		if (JString::isNotNull($attr)) {
 			if ($attr=="value")
 				$retour.="url=url+'/'+$(this).val();\n";
-			else if($attr!=null && $attr!=="")
+			else if ($attr!=null && $attr!=="")
 				$retour.="url=url+'/'+$(this).attr('".$attr."');\n";
 		}
 		return $retour;
 	}
 
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
 		$retour="";
 		if ($responseElement!=="") {
 			$responseElement=$this->_prep_value($responseElement);
@@ -1022,7 +1022,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;
@@ -1035,7 +1035,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";
@@ -1054,7 +1054,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;
@@ -1063,7 +1063,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);
 	}
 
 	/**
@@ -1073,7 +1073,7 @@ 
 	 * @param string $method Method use
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id",$immediatly=false) {
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $immediatly=false) {
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
 		$retour=$this->_getAjaxUrl($url, $attr);
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -1091,7 +1091,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 _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
 		$preventDefault=true;
 		$stopPropagation=true;
 		$jsCallback=null;
@@ -1099,14 +1099,14 @@ 
 		$method="get";
 		$params="{}";
 		extract($parameters);
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr), $event, $preventDefault, $stopPropagation);
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr), $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";
-		if($hasLoader===true){
+		if ($hasLoader===true) {
 			$this->addLoading($retour, $responseElement);
 		}
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -1133,14 +1133,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);
 	}
 
 	/**
@@ -1153,14 +1153,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);
 	}
 
 	/**
@@ -1173,7 +1173,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;
@@ -1181,7 +1181,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

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/html/HtmlBreadcrumbs.php

Spacing +37 added lines, -37 removed lines

@@ -35,14 +35,14 @@ 
 	 * @param boolean $autoActive sets the last element's class to <b>active</b> if true
 	 * @param function $hrefFunction the function who generates the href elements. default : function($e){return $e->getContent()}
 	 */
-	public function __construct($identifier,$elements=array(),$autoActive=true,$hrefFunction=NULL){
-		parent::__construct($identifier,"ol");
+	public function __construct($identifier, $elements=array(), $autoActive=true, $hrefFunction=NULL) {
+		parent::__construct($identifier, "ol");
 		$this->setProperty("class", "breadcrumb");
 		$this->content=array();
 		$this->autoActive=$autoActive;
 		$this->absolutePaths;
-		$this->_hrefFunction=function ($e){return $e->getContent();};
-		if(isset($hrefFunction)){
+		$this->_hrefFunction=function($e) {return $e->getContent(); };
+		if (isset($hrefFunction)) {
 			$this->_hrefFunction=$hrefFunction;
 		}
 		$this->addElements($elements);
@@ -53,43 +53,43 @@ 
 	 * @param string $href
 	 * @return \Ajax\bootstrap\html\HtmlLink
 	 */
-	public function addElement($element,$href="",$glyph=NULL){
+	public function addElement($element, $href="", $glyph=NULL) {
 		$size=sizeof($this->content);
-		if(is_array($element)){
+		if (is_array($element)) {
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size);
 			$elm->fromArray($element);
-		}else if($element instanceof HtmlLink){
+		}else if ($element instanceof HtmlLink) {
 			$elm=$element;
-		}else{
-			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
-			if(isset($glyph)){
+		}else {
+			$elm=new HtmlLink("lnk-".$this->identifier."-".$size, $href, $element);
+			if (isset($glyph)) {
 				$elm->wrapContentWithGlyph($glyph);
 			}
 		}
-		$elm->wrap("<li>","</li>");
+		$elm->wrap("<li>", "</li>");
 		$this->content[]=$elm;
 		$elm->setProperty($this->attr, $this->getHref($size));
 		return $elm;
 	}
 	
-	public function setActive($index=null){
-		if(!isset($index)){
+	public function setActive($index=null) {
+		if (!isset($index)) {
 			$index=sizeof($this->content)-1;
 		}
-		$li=new HtmlDoubleElement("","li");
+		$li=new HtmlDoubleElement("", "li");
 		$li->setClass("active");
 		$li->setContent($this->content[$index]->getContent());
 		$this->content[$index]=$li;
 	}
 	
-	public function addElements($elements){
-		foreach ( $elements as $element ) {
+	public function addElements($elements) {
+		foreach ($elements as $element) {
 			$this->addElement($element);
 		}
 		return $this;
 	}
 	
-	public function fromArray($array){
+	public function fromArray($array) {
 		$array=parent::fromArray($array);
 		$this->addElements($array);
 		return $array;
@@ -101,14 +101,14 @@ 
 	 * @param string $separator
 	 * @return string
 	 */
-	public function getHref($index=null,$separator="/"){
-		if(!isset($index)){
+	public function getHref($index=null, $separator="/") {
+		if (!isset($index)) {
 			$index=sizeof($this->content);
 		}
-		if($this->absolutePaths===true){
+		if ($this->absolutePaths===true) {
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
-			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),0,$index+1));
+		}else {
+			return $this->root.implode($separator, array_slice(array_map(function($e) {return $this->_hrefFunction($e); }, $this->content), 0, $index+1));
 		}
 	}
 	
@@ -117,7 +117,7 @@ 
 	 * @see \Ajax\bootstrap\html\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if($this->autoActive){
+		if ($this->autoActive) {
 			$this->setActive();
 		}
 		return parent::compile($js, $view);
@@ -135,19 +135,19 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
 	 */
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
-		foreach ($this->content as $element){
-			$element->on($event,$jsCode,$stopPropagation,$preventDefault);
+		foreach ($this->content as $element) {
+			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
 		}
 		return $this;
 	}
 	
 	public function setAutoActive($autoActive) {
-		$this->autoActive = $autoActive;
+		$this->autoActive=$autoActive;
 		return $this;
 	}
 	
 	public function _ajaxOn($operation, $event, $url, $responseElement="", $parameters=array()) {
-		foreach ($this->content as $element){
+		foreach ($this->content as $element) {
 			$element->_ajaxOn($operation, $event, $url, $responseElement, $parameters);
 		}
 		return $this;
@@ -160,18 +160,18 @@ 
 	 * @param string $attr the html attribute used to build the elements url 
 	 * @return HtmlBreadcrumbs
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 	
-	public function contentAsString(){
-		if($this->autoActive){
+	public function contentAsString() {
+		if ($this->autoActive) {
 			$this->setActive();
 		}	
 		return parent::contentAsString();
 	}
 	
-	public function getElement($index){
+	public function getElement($index) {
 		return $this->content[$index];
 	}
 	
@@ -180,7 +180,7 @@ 
 	 * @param mixed $glyph
 	 * @param int $index
 	 */
-	public function addGlyph($glyph,$index){
+	public function addGlyph($glyph, $index) {
 		$elm=$this->getElement($index);
 		return $elm->wrapContentWithGlyph($glyph);
 	}
@@ -190,9 +190,9 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
-	public function fromDispatcher($dispatcher){
-		$items=array($dispatcher->getControllerName(),$dispatcher->getActionName());
-		$items=array_merge($items,$dispatcher->getParams());
+	public function fromDispatcher($dispatcher) {
+		$items=array($dispatcher->getControllerName(), $dispatcher->getActionName());
+		$items=array_merge($items, $dispatcher->getParams());
 		return $this->addElements($items);
 	}
 	
@@ -203,7 +203,7 @@ 
 	 * @return \Ajax\bootstrap\html\HtmlBreadcrumbs
 	 */
 	public function setHrefFunction($_hrefFunction) {
-		$this->_hrefFunction = $_hrefFunction;
+		$this->_hrefFunction=$_hrefFunction;
 		return $this;
 	}	
 	

Ajax/bootstrap/html/HtmlPagination.php

Spacing +37 added lines, -37 removed lines

@@ -45,70 +45,70 @@ 
 	/**
 	 * @param string $identifier
 	 */
-	public function __construct($identifier,$from=1,$to=1,$active=NULL,$countVisible=NULL){
-		parent::__construct($identifier,"ul");
+	public function __construct($identifier, $from=1, $to=1, $active=NULL, $countVisible=NULL) {
+		parent::__construct($identifier, "ul");
 		$this->setProperty("class", "pagination");
 		$this->active=$active;
 		$this->from=$from;
 		$this->to=$to;
 		$this->urlMask="%page%";
-		if(!isset($countVisible))
+		if (!isset($countVisible))
 			$this->countVisible=$to-$from+1;
 		else
 			$this->countVisible=$countVisible;
 		$this->createContent();
 	}
 	
-	private function createElement($num,$content,$disabled=false,$current=false){
+	private function createElement($num, $content, $disabled=false, $current=false) {
 		$count=sizeof($this->content)+1;
-		$elem=new HtmlDoubleElement("li-".$this->identifier."-".$count,"li");
-		if($disabled){
+		$elem=new HtmlDoubleElement("li-".$this->identifier."-".$count, "li");
+		if ($disabled) {
 			$elem->setProperty("class", "disabled");
 		}
-		if($current){
+		if ($current) {
 			$content.="<span class='sr-only'>(current)</span>";
 			$elem->setProperty("class", "active");
 		}
-		if(!$disabled){
+		if (!$disabled) {
 			$url=$this->getUrl($num);
-			$href=new HtmlLink("a-".$this->identifier."-".$count,$url,$content);
+			$href=new HtmlLink("a-".$this->identifier."-".$count, $url, $content);
 			$href->setProperty($this->attr, $url);
 			$elem->setContent($href);
-		}else{
+		}else {
 			$elem->setContent($content);
 		}
 		$this->content[]=$elem;
 		return $this;
 	}
 	
-	protected function createContent(){
+	protected function createContent() {
 		$this->content=array();
-		$this->createElement($this->active-1,"<span aria-hidden='true'>&laquo;</span>",$this->active===1);
+		$this->createElement($this->active-1, "<span aria-hidden='true'>&laquo;</span>", $this->active===1);
 		$start=$this->getStart();
-		$end=min($start+$this->countVisible-1,$this->to);
-		for($index=$start;$index<=$end;$index++){
-			$this->createElement($index,$index,false,$index===$this->active);
+		$end=min($start+$this->countVisible-1, $this->to);
+		for ($index=$start; $index<=$end; $index++) {
+			$this->createElement($index, $index, false, $index===$this->active);
 		}
-		$this->createElement($this->active+1,"<span aria-hidden='true'>&raquo;</span>",$this->active===$this->to);
+		$this->createElement($this->active+1, "<span aria-hidden='true'>&raquo;</span>", $this->active===$this->to);
 	}
 	
-	protected function half(){
-		return (int)($this->countVisible/2);
+	protected function half() {
+		return (int) ($this->countVisible / 2);
 	}
 	
-	protected function getStart(){
+	protected function getStart() {
 		$result=1;
-		if($this->countVisible!==$this->to-$this->from+1){
-			$result=max($this->active-$this->half(),$result);
+		if ($this->countVisible!==$this->to-$this->from+1) {
+			$result=max($this->active-$this->half(), $result);
 		}
 		return $result;
 	}
 
 	public function _addEvent($event, $jsCode) {
-		foreach ($this->content as $li){
+		foreach ($this->content as $li) {
 			$content=$li->getContent();
-			if($content instanceof BaseHtml)
-				$content->_addEvent($event,$jsCode);
+			if ($content instanceof BaseHtml)
+				$content->_addEvent($event, $jsCode);
 		}
 	}
 	/**
@@ -116,15 +116,15 @@ 
 	 * @param Dispatcher $dispatcher the request dispatcher
 	 * @return \Ajax\bootstrap\html\HtmlPagination
 	 */
-	public function fromDispatcher($dispatcher){
-		$items=array($dispatcher->getControllerName(),$dispatcher->getActionName());
-		$items=array_merge($items,$dispatcher->getParams());
+	public function fromDispatcher($dispatcher) {
+		$items=array($dispatcher->getControllerName(), $dispatcher->getActionName());
+		$items=array_merge($items, $dispatcher->getParams());
 		$url=implode("/", $items);
-		if($this->urlMask==="%page%"){
+		if ($this->urlMask==="%page%") {
 			$this->urlMask=preg_replace("/[0-9]/", "%page%", $url);
 		}
-		for($index=$this->from;$index<=$this->to;$index++){
-			if($this->getUrl($index)==$url){
+		for ($index=$this->from; $index<=$this->to; $index++) {
+			if ($this->getUrl($index)==$url) {
 				$this->setActive($index);
 				break;
 			}
@@ -132,7 +132,7 @@ 
 		return $this;
 	}
 	
-	public function getUrl($index){
+	public function getUrl($index) {
 		return str_ireplace("%page%", $index, $this->urlMask);
 	}
 	
@@ -146,7 +146,7 @@ 
 		if (is_int($size)) {
 			return $this->addToPropertyUnique("class", CssRef::sizes("pagination")[$size], CssRef::sizes("pagination"));
 		}
-		if(!PhalconUtils::startsWith($size, "pagination-") && $size!=="")
+		if (!PhalconUtils::startsWith($size, "pagination-") && $size!=="")
 			$size="pagination-".$size;
 		return $this->addToPropertyCtrl("class", $size, CssRef::sizes("pagination"));
 	}
@@ -155,7 +155,7 @@ 
 		return $this->from;
 	}
 	public function setFrom($from) {
-		$this->from = $from;
+		$this->from=$from;
 		$this->createContent();
 		return $this;
 	}
@@ -163,7 +163,7 @@ 
 		return $this->to;
 	}
 	public function setTo($to) {
-		$this->to = $to;
+		$this->to=$to;
 		$this->createContent();
 		return $this;
 	}
@@ -171,7 +171,7 @@ 
 		return $this->active;
 	}
 	public function setActive($active) {
-		$this->active = $active;
+		$this->active=$active;
 		$this->createContent();
 		return $this;
 	}
@@ -179,7 +179,7 @@ 
 		return $this->urlMask;
 	}
 	public function setUrlMask($urlMask) {
-		$this->urlMask = $urlMask;
+		$this->urlMask=$urlMask;
 		$this->createContent();
 		return $this;
 	}
@@ -187,7 +187,7 @@ 
 		return $this->countVisible;
 	}
 	public function setCountVisible($countVisible) {
-		$this->countVisible = $countVisible;
+		$this->countVisible=$countVisible;
 		$this->createContent();
 		return $this;
 	}

Ajax/bootstrap/html/base/HtmlNavElement.php

Spacing +10 added lines, -10 removed lines

@@ -20,8 +20,8 @@ 
 	protected $attr;
 	
 	
-	public function __construct($identifier,$tagName){
-		parent::__construct($identifier,$tagName);
+	public function __construct($identifier, $tagName) {
+		parent::__construct($identifier, $tagName);
 		$this->root="";
 		$this->attr="data-ajax";
 	}
@@ -33,11 +33,11 @@ 
 	 * @param string $attr the html attribute used to build the elements url
 	 * @return HtmlNavElement
 	 */
-	public function autoGetOnClick($targetSelector){
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
+	public function autoGetOnClick($targetSelector) {
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
 	}
 	
-	public function contentAsString(){
+	public function contentAsString() {
 		return implode("", $this->content);
 	}
 	
@@ -45,15 +45,15 @@ 
 	 * Generate the jquery script to set the elements to the HtmlNavElement
 	 * @param JsUtils $jsUtils
 	 */
-	public function jsSetContent(JsUtils $jsUtils){
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
+	public function jsSetContent(JsUtils $jsUtils) {
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
 	}
 	
 	public function getRoot() {
 		return $this->root;
 	}
 	public function setRoot($root) {
-		$this->root = $root;
+		$this->root=$root;
 		return $this;
 	}
 	public function getAttr() {
@@ -66,12 +66,12 @@ 
 	 * @return HtmlNavElement
 	 */
 	public function setAttr($attr) {
-		$this->attr = $attr;
+		$this->attr=$attr;
 		return $this;
 	}
 
 	public function __call($method, $args) {
-		if(isset($this->$method) && is_callable($this->$method)) {
+		if (isset($this->$method) && is_callable($this->$method)) {
 			return call_user_func_array(
 					$this->$method,
 					$args