jcheron / phalcon-jquery

Ajax/Jquery.php

Braces +97 added lines, -66 removed lines

@@ -409,8 +409,9 @@ 
 		$element=$this->_prep_element($element);
 		$class=$this->_prep_value($class);
 		$str="$({$element}).addClass({$class});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -426,10 +427,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;
 	}
 
@@ -444,10 +447,12 @@ 
 		if (isset($value)) {
 			$value=$this->_prep_value($value);
 			$str="$({$element}).html({$value});";
-		} else
-			$str="$({$element}).html();";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		} else {
+					$str="$({$element}).html();";
+		}
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -485,8 +490,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;
 	}
 
@@ -501,8 +507,9 @@ 
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).append({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -517,8 +524,9 @@ 
 		$to=$this->_prep_element($to);
 		$element=$this->_prep_element($element);
 		$str="$({$to}).prepend({$element});";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -543,8 +551,9 @@ 
 
 		$str="$({$element}).fadeIn({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -569,8 +578,9 @@ 
 
 		$str="$({$element}).fadeOut({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -595,8 +605,9 @@ 
 
 		$str="$({$element}).hide({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -614,8 +625,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).removeClass(\"$class\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -640,8 +652,9 @@ 
 
 		$str="$({$element}).slideUp({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -666,8 +679,9 @@ 
 
 		$str="$({$element}).slideDown({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -692,8 +706,9 @@ 
 
 		$str="$({$element}).slideToggle({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -710,8 +725,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;
 	}
 
@@ -729,8 +745,9 @@ 
 		$element=$this->_prep_element($element);
 		$str="$({$element}).toggleClass(\"$class\");";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -744,8 +761,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;
 	}
 
@@ -770,8 +788,9 @@ 
 
 		$str="$({$element}).show({$speed}{$callback});";
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -789,8 +808,9 @@ 
 			$str.="else{".$jsCodeIfFalse."}";
 		}
 
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$str;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$str;
+		}
 		return $str;
 	}
 
@@ -856,10 +876,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;
 	}
@@ -909,8 +930,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;
 	}
 
@@ -1031,8 +1053,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;
 	}
 
@@ -1040,10 +1063,11 @@ 
 		$url=$this->_correctAjaxUrl($url);
 		$retour="url='".$url."';\n";
 		if(JString::isNotNull($attr)){
-			if ($attr=="value")
-				$retour.="url=url+'/'+$(this).val();\n";
-			else if($attr!=null && $attr!=="")
-				$retour.="url=url+'/'+$(this).attr('".$attr."');\n";
+			if ($attr=="value") {
+							$retour.="url=url+'/'+$(this).val();\n";
+			} else if($attr!=null && $attr!=="") {
+							$retour.="url=url+'/'+$(this).attr('".$attr."');\n";
+			}
 		}
 		return $retour;
 	}
@@ -1059,8 +1083,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);
 		}
@@ -1081,8 +1106,9 @@ 
 		$retour.="\tdata=$.parseJSON(data);for(var key in data){if($('#'+key).length){ if($('#'+key).is('[value]')) { $('#'+key).val(data[key]);} else { $('#'+key).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;
 	}
 
@@ -1100,8 +1126,9 @@ 
 		$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=$('#'+newId);\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();newElm.attr('id',newId);\n"."\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"."\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";
 
 		$retour.="\t".$jsCallback."\n"."});\n";
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1121,8 +1148,9 @@ 
 			}});\n";
 			$retour.="$('#".$form."').submit();\n";
 		}
-		if ($immediatly)
-			$this->jquery_code_for_compile[]=$retour;
+		if ($immediatly) {
+					$this->jquery_code_for_compile[]=$retour;
+		}
 		return $retour;
 	}
 
@@ -1198,11 +1226,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;
 	}
 
@@ -1230,8 +1260,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;
 	}
 

Ajax/JsUtils.php

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);
+		}
 	}
 
 	/**

Ajax/bootstrap/components/Tabs.php

Braces +15 added lines, -10 removed lines

@@ -35,8 +35,9 @@ 
 	}
 
 	public function getTab($index) {
-		if ($index>0&&$index<sizeof($this->tabs))
-			return $this->tabs [$index];
+		if ($index>0&&$index<sizeof($this->tabs)) {
+					return $this->tabs [$index];
+		}
 	}
 
 	public function show($index) {
@@ -52,8 +53,9 @@ 
 	 */
 	public function onShow($index, $jsCode) {
 		$tab=$this->getTab($index);
-		if (isset($tab))
-			return $tab->onShow($jsCode);
+		if (isset($tab)) {
+					return $tab->onShow($jsCode);
+		}
 	}
 
 	/**
@@ -64,8 +66,9 @@ 
 	 */
 	public function onShown($index, $jsCode) {
 		$tab=$this->getTab($index);
-		if (isset($tab))
-			return $tab->onShown($jsCode);
+		if (isset($tab)) {
+					return $tab->onShown($jsCode);
+		}
 	}
 
 	/**
@@ -76,8 +79,9 @@ 
 	 */
 	public function onHide($index, $jsCode) {
 		$tab=$this->getTab($index);
-		if (isset($tab))
-			return $tab->onShow($jsCode);
+		if (isset($tab)) {
+					return $tab->onShow($jsCode);
+		}
 	}
 
 	/**
@@ -88,7 +92,8 @@ 
 	 */
 	public function onHidden($index, $jsCode) {
 		$tab=$this->getTab($index);
-		if (isset($tab))
-			return $tab->onShow($jsCode);
+		if (isset($tab)) {
+					return $tab->onShow($jsCode);
+		}
 	}
 }
\ No newline at end of file

Ajax/bootstrap/html/HtmlAccordion.php

Braces +3 added lines, -2 removed lines

@@ -77,7 +77,8 @@
 	}
 
 	public function getPanel($index) {
-		if ($index<sizeof($this->content))
-			return $this->content [$index];
+		if ($index<sizeof($this->content)) {
+					return $this->content [$index];
+		}
 	}
 }
\ No newline at end of file

Ajax/bootstrap/html/HtmlBreadcrumbs.php

Braces +3 added lines, -3 removed lines

@@ -67,9 +67,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);
@@ -116,7 +116,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),0,$index+1));
 		}
 	}

Ajax/bootstrap/html/HtmlButtongroups.php

Braces +20 added lines, -16 removed lines

@@ -44,8 +44,9 @@ 
 	}
 
 	public function setStyle($value) {
-		foreach ( $this->elements as $element )
-			$element->setStyle($value);
+		foreach ( $this->elements as $element ) {
+					$element->setStyle($value);
+		}
 	}
 
 	private function dropdownAsButton($bt) {
@@ -70,16 +71,18 @@ 
 		} elseif ($element instanceof HtmlButton) {
 			$this->elements[]=$element;
 		} elseif (is_array($element)) {
-			if (array_key_exists("glyph", $element))
-				$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
-			elseif (array_key_exists("btnCaption", $element)) {
-				if (array_key_exists("split", $element))
-					$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
-				else
-					$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+			if (array_key_exists("glyph", $element)) {
+							$bt=new HtmlGlyphButton($this->identifier."-button-".$iid);
+			} elseif (array_key_exists("btnCaption", $element)) {
+				if (array_key_exists("split", $element)) {
+									$bt=new HtmlSplitbutton($this->identifier."-dropdown-".$iid);
+				} else {
+									$bt=new HtmlDropdown($this->identifier."-dropdown-".$iid);
+				}
 				$this->dropdownAsButton($bt);
-			} else
-				$bt=new HtmlButton($this->identifier."-button-".$iid);
+			} else {
+							$bt=new HtmlButton($this->identifier."-button-".$iid);
+			}
 			$bt->fromArray($element);
 			$this->elements[]=$bt;
 			$result=$bt;
@@ -110,8 +113,9 @@ 
 	public function setAlignment($value) {
 		if (is_int($value)) {
 			$value=CssRef::alignment("btn-group")[$value];
-		} else
-			$value="btn-group-".$value;
+		} else {
+					$value="btn-group-".$value;
+		}
 		if (strstr($value, "justified")) {
 			foreach ( $this->elements as $element ) {
 				$element->wrap('<div class="btn-group" role="group">', '</div>');
@@ -126,9 +130,9 @@ 
 	 * @return HtmlButton
 	 */
 	public function getElement($index) {
-		if (is_int($index))
-			return $this->elements[$index];
-		else {
+		if (is_int($index)) {
+					return $this->elements[$index];
+		} else {
 			$elm=$this->getElementById($index, $this->elements);
 			return $elm;
 		}

Ajax/bootstrap/html/HtmlButtontoolbar.php

Braces +6 added lines, -5 removed lines

@@ -45,9 +45,9 @@ 
 	 */
 	private function getLastButtonGroup() {
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
-		else {
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		} else {
 			$bg=new HtmlButtongroups($this->identifier."-buttongroups-".$nb);
 			$this->elements []=$bg;
 		}
@@ -65,8 +65,9 @@ 
 	public function getLastGroup() {
 		$bg=null;
 		$nb=sizeof($this->elements);
-		if ($nb>0)
-			$bg=$this->elements [$nb-1];
+		if ($nb>0) {
+					$bg=$this->elements [$nb-1];
+		}
 		return $bg;
 	}
 

Ajax/bootstrap/html/HtmlCarousel.php

Braces +10 added lines, -7 removed lines

@@ -75,27 +75,30 @@
 	}
 
 	private function getGlyph($sens="left") {
-		if (array_key_exists($sens, $this->_glyphs))
-			return $this->_glyphs [$sens];
+		if (array_key_exists($sens, $this->_glyphs)) {
+					return $this->_glyphs [$sens];
+		}
 		return "glyphicon-chevron-".$sens;
 	}
 
 	public function setRightGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["right"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["right"]=$glyphicon;
+		}
 	}
 
 	public function setLeftGlyph($glyphicon) {
 		$glyphs=CssRef::glyphIcons();
-		if (array_search($glyphicon, $glyphs)!==false)
-			$this->_glyphs ["left"]=$glyphicon;
+		if (array_search($glyphicon, $glyphs)!==false) {
+					$this->_glyphs ["left"]=$glyphicon;
+		}
 	}
 
 	public function addImage($imageSrc, $imageAlt="", $caption=NULL, $description=NULL) {
 		if(is_array($imageSrc)){
 			$this->addImage($imageSrc[0],@$imageSrc[1],@$imageSrc[2],@$imageSrc[3]);
-		}else{
+		} else{
 			$image=new HtmlCarouselItem("item-".$this->identifier);
 			$image->setImageSrc($this->_base.$imageSrc);
 			$image->setImageAlt($imageAlt);

Ajax/bootstrap/html/HtmlCollapse.php

Braces +11 added lines, -8 removed lines

@@ -24,17 +24,19 @@ 
 
 	public function attachTo($identifier) {
 		$this->element->setProperty("aria-controls", $identifier);
-		if ($this->element->getTagName()==="a")
-			$this->element->setProperty("href", "#".$identifier);
-		else
-			$this->element->setProperty("data-target", "#".$identifier);
+		if ($this->element->getTagName()==="a") {
+					$this->element->setProperty("href", "#".$identifier);
+		} else {
+					$this->element->setProperty("data-target", "#".$identifier);
+		}
 	}
 
 	public function getAttachedZone() {
 		$id=$this->element->getProperty("aria-controls");
-		if (!isset($id))
-			if ($this->element->getTagName()==="a")
+		if (!isset($id)) {
+					if ($this->element->getTagName()==="a")
 				$id=$this->element->getProperty("href");
+		}
 		if (!isset($id)||$id==="#") {
 			$id="collapse-".$this->element->getIdentifier();
 			$this->attachTo($id);
@@ -49,8 +51,9 @@ 
 	}
 
 	public function createCollapsedZone($content="", $attachTo=NULL) {
-		if (isset($attachTo))
-			$this->attachTo($attachTo);
+		if (isset($attachTo)) {
+					$this->attachTo($attachTo);
+		}
 		$collapsedZone=new HtmlDoubleElement($this->getAttachedZone());
 		$collapsedZone->setProperty("class", "collapse");
 		$collapsedZone->setContent($content);