jcheron / phalcon-jquery

Ajax/Jquery.php

Braces +98 added lines, -66 removed lines

@@ -424,8 +424,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;
 	}
 
@@ -441,10 +442,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;
 	}
 
@@ -460,10 +463,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;
 	}
 	/**
@@ -478,8 +483,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;
 	}
 	// --------------------------------------------------------------------
@@ -516,8 +522,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;
 	}
 
@@ -542,8 +549,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -568,8 +576,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -594,8 +603,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -622,8 +632,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -648,8 +659,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -674,8 +686,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -692,8 +705,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;
 	}
 
@@ -709,8 +723,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;
 	}
 
@@ -735,8 +750,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -754,8 +770,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -821,12 +838,14 @@ 
 		if ($stopPropagation===true) {
 			$js="event.stopPropagation();\n".$js;
 		}
-		if (array_search($event, $this->jquery_events)===false)
-			$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
-		else
-			$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
-		if($immediatly)
-			$this->jquery_code_for_compile[]=$event;
+		if (array_search($event, $this->jquery_events)===false) {
+					$event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
+		} else {
+					$event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
+		}
+		if($immediatly) {
+					$this->jquery_code_for_compile[]=$event;
+		}
 		return $event;
 	}
 
@@ -879,8 +898,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;
 	}
 
@@ -1003,8 +1023,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;
 	}
 
@@ -1012,13 +1033,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;
 	}
@@ -1040,8 +1063,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);
 		}
@@ -1065,8 +1089,9 @@ 
 		$retour.="\t".$jsCallback."\n".
 				"\t$(document).trigger('jsonReady',[data]);\n".
 		"});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1105,7 +1130,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)";
 		}
@@ -1115,8 +1140,9 @@ 
 		$retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n";
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 	/**
@@ -1157,8 +1183,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1238,11 +1265,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;
 	}
 
@@ -1271,8 +1300,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;
 	}
 
@@ -1291,7 +1321,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)

Ajax/Semantic.php

Braces +1 added lines, -1 removed lines

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

Ajax/bootstrap/html/HtmlProgressbar.php

Braces +21 added lines, -17 removed lines

@@ -33,11 +33,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setActive($value);
 			}
-		}else{
-			if ($value===true)
-				$this->active="active";
-			else
-				$this->active="";
+		} else{
+			if ($value===true) {
+							$this->active="active";
+			} else {
+							$this->active="";
+			}
 		}
 		return $this;
 	}
@@ -47,11 +48,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->setStriped($value);
 			}
-		}else{
-			if ($value===true)
-				$this->striped="progress-bar-striped";
-			else
-				$this->striped="";
+		} else{
+			if ($value===true) {
+							$this->striped="progress-bar-striped";
+			} else {
+							$this->striped="";
+			}
 		}
 		return $this;
 	}
@@ -61,11 +63,12 @@ 
 			foreach ($this->content as $pb){
 				$pb->showCaption($value);
 			}
-		}else{
-			if ($value===true)
-				$this->caption="%value%%";
-			else
-				$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+		} else{
+			if ($value===true) {
+							$this->caption="%value%%";
+			} else {
+							$this->caption='<span class="sr-only">%value%% Complete (%style%)</span>';
+			}
 		}
 		return $this;
 	}
@@ -137,8 +140,9 @@ 
 		if(isset($this->styleLimits)&& JArray::isAssociative($this->styleLimits)){
 			foreach ($this->styleLimits as $k=>$v){
 				$actualStyle=$k;
-				if($v>$this->value)
-					break;
+				if($v>$this->value) {
+									break;
+				}
 			}
 		}
 		$this->style=$actualStyle;

Ajax/common/html/PropertyWrapper.php

Braces +8 added lines, -6 removed lines

@@ -17,8 +17,9 @@ 
 				$value1=reset($input);
 				if (is_object($value1)) {
 					$output=PropertyWrapper::wrapObjects($input, $js, $separator=' ');
-				} else
-					$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				} else {
+									$output=PropertyWrapper::wrapStrings($input, $separator=' ', $valueQuote='"');
+				}
 			}
 		}
 		return $output;
@@ -37,10 +38,11 @@ 
 
 	public static function wrapObjects($input, $js=NULL, $separator=' ') {
 		return implode($separator, array_map(function ($v) use($js) {
-			if (is_object($v))
-				return $v->compile($js);
-			else
-				return $v;
+			if (is_object($v)) {
+							return $v->compile($js);
+			} else {
+							return $v;
+			}
 		}, $input));
 	}
 }
\ No newline at end of file

Ajax/common/html/HtmlDoubleElement.php

Braces +10 added lines, -8 removed lines

@@ -29,15 +29,17 @@
 
 	public function addContent($content,$before=false) {
 		if (is_array($this->content)===false) {
-			if(isset($this->content))
-				$this->content=array ($this->content);
-			else
-				$this->content=array();
+			if(isset($this->content)) {
+							$this->content=array ($this->content);
+			} else {
+							$this->content=array();
+			}
+		}
+		if($before) {
+					array_unshift($this->content,$content);
+		} else {
+					$this->content []=$content;
 		}
-		if($before)
-			array_unshift($this->content,$content);
-		else
-			$this->content []=$content;
 		return $this;
 	}
 

Ajax/common/html/html5/HtmlSelect.php

Braces +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 	public function addOption($element,$value="",$selected=false){
 		if($element instanceof HtmlOption){
 			$option=$element;
-		}else{
+		} else{
 			$option=new HtmlOption($this->identifier."-".count($this->options), $element,$value);
 		}
 		if($selected || $option->getValue()==$this->getProperty("value")){
@@ -67,7 +67,7 @@ 
 			foreach ($array as $k=>$v){
 				$this->addOption($v, $k);
 			}
-		}else{
+		} else{
 			foreach ($array as $v){
 				$this->addOption($v, $v);
 			}

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Braces +6 added lines, -5 removed lines

@@ -65,9 +65,9 @@ 
 		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{
+		} else{
 			$elm=new HtmlLink("lnk-".$this->identifier."-".$size,$href,$element);
 			if(isset($glyph)){
 				$elm->wrapContentWithGlyph($glyph);
@@ -114,7 +114,7 @@ 
 		}
 		if($this->absolutePaths===true){
 			return $this->_hrefFunction($this->content[$index]);
-		}else{
+		} else{
 			return $this->root.implode($separator, array_slice(array_map(function($e){return $this->_hrefFunction($e);}, $this->content),$this->startIndex,$index+1));
 		}
 	}
@@ -204,8 +204,9 @@ 
 		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
 			$items[]=$action;
 			foreach ($params as $p){
-				if(\is_object($p)===false)
-				$items[]=$p;
+				if(\is_object($p)===false) {
+								$items[]=$p;
+				}
 			}
 		}
 		return $this->addElements($items);

Ajax/semantic/html/elements/HtmlIcon.php

Braces +6 added lines, -4 removed lines

@@ -92,8 +92,9 @@ 
 
 	public function setCircular($inverted=false){
 		$invertedStr="";
-		if($inverted!==false)
-			$invertedStr=" inverted";
+		if($inverted!==false) {
+					$invertedStr=" inverted";
+		}
 		return $this->addToMember($this->attributes, "circular".$invertedStr);
 	}
 
@@ -110,8 +111,9 @@ 
 	 */
 	public function setBordered($inverted=false){
 		$invertedStr="";
-		if($inverted!==false)
-			$invertedStr=" inverted";
+		if($inverted!==false) {
+					$invertedStr=" inverted";
+		}
 			return $this->addToMember($this->attributes, "bordered".$invertedStr);
 	}
 

Ajax/semantic/html/elements/HtmlContainer.php

Braces +3 added lines, -2 removed lines

@@ -22,8 +22,9 @@
 	}
 
 	public function setAlignement($value="justified"){
-		if($value!=="justified")
-			$value.=" aligned";
+		if($value!=="justified") {
+					$value.=" aligned";
+		}
 		return $this->addToProperty("class", $value);
 	}