jcheron / phalcon-jquery

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

Spacing +56 added lines, -56 removed lines

@@ -45,7 +45,7 @@ 
 
 	protected function _setDi($di) {
 		$this->_di=$di;
-		if ($this->js!=null&&$di!=null)
+		if ($this->js!=null && $di!=null)
 			$this->js->setDi($di);
 	}
 
@@ -120,17 +120,17 @@ 
 	}
 
 	public function __construct($params=array()) {
-		$defaults=array (
+		$defaults=array(
 				'driver' => 'Jquery'
 		);
-		foreach ( $defaults as $key => $val ) {
-			if (isset($params[$key])&&$params[$key]!=="") {
+		foreach ($defaults as $key => $val) {
+			if (isset($params[$key]) && $params[$key]!=="") {
 				$defaults[$key]=$params[$key];
 			}
 		}
 		extract($defaults);
 		$this->js=new Jquery();
-		$this->cdns=array ();
+		$this->cdns=array();
 	}
 
 	public function addToCompile($jsScript) {
@@ -382,7 +382,7 @@ 
 	 * @return string
 	 */
 	public function addClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
 	}
 	
 	/**
@@ -392,8 +392,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function after($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
+	public function after($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
 	}
 	
 	/**
@@ -403,8 +403,8 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 * @return string
 	 */
-	public function before($to, $element, $immediatly=false){
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
+	public function before($to, $element, $immediatly=false) {
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
 	}
 	
 	/**
@@ -424,8 +424,8 @@ 
 	 * @param string $value
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
-	public function val($element='this',$value='',$immediatly=false){
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
+	public function val($element='this', $value='', $immediatly=false) {
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
 	}
 
 	/**
@@ -435,7 +435,7 @@ 
 	 * @param boolean $immediatly defers the execution if set to false
 	 */
 	public function html($element='this', $value='', $immediatly=false) {
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -460,7 +460,7 @@ 
 	 * @return string
 	 */
 	public function append($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
 	}
 
 	/**
@@ -471,7 +471,7 @@ 
 	 * @return string
 	 */
 	public function prepend($to, $element, $immediatly=false) {
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -522,7 +522,7 @@ 
 	 * @return string
 	 */
 	public function removeClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
 	}
 	// --------------------------------------------------------------------
 	/**
@@ -583,7 +583,7 @@ 
 	 * @return string
 	 */
 	public function toggleClass($element='this', $class='', $immediatly=false) {
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
 	}
 
 	/**
@@ -630,7 +630,7 @@ 
 	 */
 	public function compile($view=NULL, $view_var='script_foot', $script_tags=TRUE) {
 		$bs=$this->_bootstrap;
-		if (isset($bs)&&isset($view)) {
+		if (isset($bs) && isset($view)) {
 			$bs->compileHtml($this, $view);
 		}
 		return $this->js->_compile($view, $view_var, $script_tags);
@@ -710,27 +710,27 @@ 
 				$json_result=$result->result_array();
 			} elseif (is_array($result)) {
 				$json_result=$result;
-			} else {
+			}else {
 				return $this->_prep_args($result);
 			}
-		} else {
+		}else {
 			return 'null';
 		}
 		return $this->_create_json($json_result, $match_array_type);
 	}
 
 	private function _create_json($json_result, $match_array_type) {
-		$json=array ();
+		$json=array();
 		$_is_assoc=TRUE;
-		if (!is_array($json_result)&&empty($json_result)) {
+		if (!is_array($json_result) && empty($json_result)) {
 			show_error("Generate JSON Failed - Illegal key, value pair.");
 		} elseif ($match_array_type) {
 			$_is_assoc=$this->_is_associative_array($json_result);
 		}
-		foreach ( $json_result as $k => $v ) {
+		foreach ($json_result as $k => $v) {
 			if ($_is_assoc) {
 				$json[]=$this->_prep_args($k, TRUE).':'.$this->generate_json($v, $match_array_type);
-			} else {
+			}else {
 				$json[]=$this->generate_json($v, $match_array_type);
 			}
 		}
@@ -745,7 +745,7 @@ 
 	 * @return type
 	 */
 	public function _is_associative_array($arr) {
-		foreach ( array_keys($arr) as $key => $val ) {
+		foreach (array_keys($arr) as $key => $val) {
 			if ($key!==$val) {
 				return TRUE;
 			}
@@ -764,11 +764,11 @@ 
 			return 'null';
 		} elseif (is_bool($result)) {
 			return ($result===TRUE) ? 'true' : 'false';
-		} elseif (is_string($result)||$is_key) {
-			return '"'.str_replace(array (
-					'\\',"\t","\n","\r",'"','/'
-			), array (
-					'\\\\','\\t','\\n',"\\r",'\"','\/'
+		} elseif (is_string($result) || $is_key) {
+			return '"'.str_replace(array(
+					'\\', "\t", "\n", "\r", '"', '/'
+			), array(
+					'\\\\', '\\t', '\\n', "\\r", '\"', '\/'
 			), $result).'"';
 		} elseif (is_scalar($result)) {
 			return $result;
@@ -783,8 +783,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -794,8 +794,8 @@ 
 	 * @param string $method Method used
 	 * @param string $jsCallback javascript code to execute after the request
 	 */
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
 	}
 
 	/**
@@ -805,8 +805,8 @@ 
 	 * @param string $url the request address
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	public function jsonOn($event,$element, $url,$parameters=array()) {
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
+	public function jsonOn($event, $element, $url, $parameters=array()) {
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
 	}
 	
 	/**
@@ -850,8 +850,8 @@ 
 	 * @param string $url the request url
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get")
 	 */
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
 	}
 
 	/**
@@ -863,7 +863,7 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param string $attr the html attribute added to the request
 	 */
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
 	}
 
@@ -901,8 +901,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -915,8 +915,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -930,7 +930,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
 	}
 
 	/**
@@ -954,8 +954,8 @@ 
 	 * @param string $jsCallback javascript code to execute after the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
 	}
 
 	/**
@@ -968,8 +968,8 @@ 
 	 * @param string $attr the html attribute added to the request
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
 	 */
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
 	}
 
 	/**
@@ -983,7 +983,7 @@ 
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
 	 */
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
 	}
 
 	/**
@@ -1073,7 +1073,7 @@ 
 
 	public function setCDNs($cdns) {
 		if (is_array($cdns)===false) {
-			$cdns=array (
+			$cdns=array(
 					$cdns
 			);
 		}
@@ -1084,9 +1084,9 @@ 
 		$hasJQuery=false;
 		$hasJQueryUI=false;
 		$hasBootstrap=false;
-		$result=array ();
-		foreach ( $this->cdns as $cdn ) {
-			switch(get_class($cdn)) {
+		$result=array();
+		foreach ($this->cdns as $cdn) {
+			switch (get_class($cdn)) {
 				case "Ajax\lib\CDNJQuery":
 					$hasJQuery=true;
 					$result[0]=$cdn;
@@ -1104,10 +1104,10 @@ 
 		if ($hasJQuery===false) {
 			$result[0]=new CDNJQuery("x");
 		}
-		if ($hasJQueryUI===false&&isset($this->_ui)) {
+		if ($hasJQueryUI===false && isset($this->_ui)) {
 			$result[1]=new CDNGuiGen("x", $template);
 		}
-		if ($hasBootstrap===false&&isset($this->_bootstrap)) {
+		if ($hasBootstrap===false && isset($this->_bootstrap)) {
 			$result[2]=new CDNBootstrap("x");
 		}
 		ksort($result);
@@ -1121,7 +1121,7 @@ 
 			$this->_setDi($di);
 		}
 	}
-} else {
+}else {
 	class JsUtils extends _JsUtils {
 
 		public function setDi(DiInterface $di) {

Ajax/bootstrap/components/Collapse.php

Spacing +1 added lines, -1 removed lines

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

Ajax/bootstrap/components/GenericComponent.php

Spacing +3 added lines, -3 removed lines

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

Ajax/bootstrap/components/Modal.php

Spacing +1 added lines, -1 removed lines

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

Ajax/bootstrap/components/SimpleBsComponent.php

Spacing +4 added lines, -4 removed lines

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

Ajax/bootstrap/components/Splitbutton.php

Spacing +2 added lines, -2 removed lines

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

Ajax/bootstrap/components/Tabs.php

Spacing +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@ 
 
 	public function __construct(JsUtils $js) {
 		parent::__construct($js);
-		$this->tabs=array ();
+		$this->tabs=array();
 	}
 
 	public function getTabs() {
@@ -35,7 +35,7 @@ 
 	}
 
 	public function getTab($index) {
-		if ($index>0&&$index<sizeof($this->tabs))
+		if ($index>0 && $index<sizeof($this->tabs))
 			return $this->tabs [$index];
 	}
 

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

Spacing +7 added lines, -7 removed lines

@@ -19,7 +19,7 @@ 
 		$this->setClass("panel-group");
 		$this->setRole("tablist");
 		$this->setProperty("aria-multiselectable", "true");
-		$this->content=array ();
+		$this->content=array();
 	}
 
 	public function addPanel($title, $content) {
@@ -45,8 +45,8 @@ 
 	 * @param string $action a Phalcon action
 	 * @param $params The parameters to pass to the view
 	 */
-	public function renderContentPanel($title,$view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+	public function renderContentPanel($title, $view, $controller, $action, $params=NULL) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $this->addPanel($title, $template);
@@ -59,19 +59,19 @@ 
 	 * @param string $controller a Phalcon controller
 	 * @param string $action a Phalcon action
 	 */
-	public function forwardPanel($title,$initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forwardPanel($title, $initialController, $controller, $action) {
+		$dispatcher=$initialController->dispatcher;
 		$dispatcher->setControllerName($controller);
 		$dispatcher->setActionName($action);
 		$dispatcher->dispatch();
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $this->addPanel($title, $template);
 	}
 
 	public function run(JsUtils $js) {
-		foreach ( $this->content as $content ) {
+		foreach ($this->content as $content) {
 			$content->run($js);
 		}
 	}

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/HtmlAlert.php

Spacing +3 added lines, -3 removed lines

@@ -44,13 +44,13 @@ 
 
 	public function addCloseButton() {
 		$button=new HtmlButton("close-".$this->identifier);
-		$button->setProperties(array (
+		$button->setProperties(array(
 				"class" => "close",
 				"data-dismiss" => "alert",
 				"aria-label" => "close"
 		));
 		$button->setValue('<span aria-hidden="true">&times;</span>');
-		$this->addToPropertyCtrl("class", "alert-dismissible", array (
+		$this->addToPropertyCtrl("class", "alert-dismissible", array(
 				"alert-dismissible"
 		));
 		$this->button=$button;
@@ -79,7 +79,7 @@ 
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::compile()
 	 */
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
-		if ($this->closeable&&$this->button==="") {
+		if ($this->closeable && $this->button==="") {
 			$this->addCloseButton();
 		}
 		return parent::compile($js, $view);