jcheron / phalcon-jquery

Ajax/semantic/traits/SemanticHtmlElementsTrait.php

Spacing +25 added lines, -25 removed lines

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

Ajax/Jquery.php

Spacing +26 added lines, -26 removed lines

@@ -17,21 +17,21 @@ 
  * jQuery Class
  */
 class Jquery {
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
 	protected $_di;
 	protected $_ui;
 	protected $_bootstrap;
 	protected $_semantic;
 	protected $libraryFile;
 	protected $_javascript_folder='js';
-	protected $jquery_code_for_load=array ();
-	protected $jquery_code_for_compile=array ();
+	protected $jquery_code_for_load=array();
+	protected $jquery_code_for_compile=array();
 	protected $jquery_corner_active=FALSE;
 	protected $jquery_table_sorter_active=FALSE;
 	protected $jquery_table_sorter_pager_active=FALSE;
 	protected $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) {
@@ -61,7 +61,7 @@ 
 
 	public function __construct($params) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 	}
@@ -144,12 +144,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";
 		}
 	}
@@ -168,12 +168,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;
@@ -187,7 +187,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});";
@@ -211,12 +211,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='';
 		}
 
@@ -250,7 +250,7 @@ 
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
 	 * @return string
 	 */
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
 		if (is_array($js)) {
 			$js=implode("\n\t\t", $js);
 		}
@@ -264,7 +264,7 @@ 
 			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
 		else
 			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
+		if ($immediatly)
 			$this->jquery_code_for_compile[]=$event;
 		return $event;
 	}
@@ -306,7 +306,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -321,7 +321,7 @@ 
 		$script.='});';
 
 		$this->jquery_code_for_compile=array();
-		if($this->params["debug"]==false){
+		if ($this->params["debug"]==false) {
 			$script=$this->minify($script);
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
@@ -343,7 +343,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	// --------------------------------------------------------------------
@@ -355,12 +355,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;
 		}
 	}
@@ -376,7 +376,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;
@@ -394,7 +394,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;
@@ -409,8 +409,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)) {
@@ -421,7 +421,7 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/JsUtils.php

Spacing +33 added lines, -33 removed lines

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