jcheron / phalcon-jquery

Ajax/php/phalcon/JsUtils.php

Spacing +15 added lines, -15 removed lines

@@ -7,7 +7,7 @@ 
 use Phalcon\Mvc\View;
 use Phalcon\Mvc\Controller;
 
-class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface{
+class JsUtils extends \Ajax\JsUtils implements InjectionAwareInterface {
 	protected $_di;
 	public function setDi(DiInterface $di) {
 		$this->_di=$di;
@@ -18,49 +18,49 @@ 
 		return $this->_di;
 	}
 
-	public function getUrl($url){
+	public function getUrl($url) {
 		return $this->_di->get("url")->get($url);
 	}
 
-	public function addViewElement($identifier,$content,$view){
+	public function addViewElement($identifier, $content, $view) {
 		$controls=$view->getVar("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->setVar("q", $controls);
 	}
 
-	public function createScriptVariable($view,$view_var, $output){
-		$view->setVar($view_var,$output);
+	public function createScriptVariable($view, $view_var, $output) {
+		$view->setVar($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($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 $template;
 	}
 
 	public function renderContent($view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$params=$dispatcher->getParams();
 		$action=$dispatcher->getActionName();
 		$items=array($dispatcher->getControllerName());
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
 			$items[]=$action;
-			foreach ($params as $p){
-				if(\is_object($p)===false)
+			foreach ($params as $p) {
+				if (\is_object($p)===false)
 					$items[]=$p;
 			}
 		}

Ajax/php/laravel/JsUtils.php

Spacing +15 added lines, -15 removed lines

@@ -3,49 +3,49 @@
 namespace Ajax\php\laravel;
 
 
-class JsUtils extends \Ajax\JsUtils{
-	public function getUrl($url){
+class JsUtils extends \Ajax\JsUtils {
+	public function getUrl($url) {
 		return $url;
 	}
-	public function addViewElement($identifier,$content,$view){
+	public function addViewElement($identifier, $content, $view) {
 		$controls=$view->__get("q");
-		if (isset($controls) === false) {
-			$controls=array ();
+		if (isset($controls)===false) {
+			$controls=array();
 		}
 		$controls[$identifier]=$content;
 		$view->__set("q", $controls);
 	}
 
-	public function createScriptVariable($view,$view_var, $output){
-		$view->__set($view_var,$output);
+	public function createScriptVariable($view, $view_var, $output) {
+		$view->__set($view_var, $output);
 	}
 
-	public function forward($initialController,$controller,$action){
-		$dispatcher = $initialController->dispatcher;
+	public function forward($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 $template;
 	}
 
 	public function renderContent($view, $controller, $action, $params=NULL) {
-		$template=$view->getRender($controller, $action, $params, function ($view) {
+		$template=$view->getRender($controller, $action, $params, function($view) {
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
 		});
 		return $template;
 	}
 
-	public function fromDispatcher($dispatcher){
+	public function fromDispatcher($dispatcher) {
 		$params=$dispatcher->getParams();
 		$action=$dispatcher->getActionName();
 		$items=array($dispatcher->getControllerName());
-		if(\sizeof($params)>0 || \strtolower($action)!="index" ){
+		if (\sizeof($params)>0 || \strtolower($action)!="index") {
 			$items[]=$action;
-			foreach ($params as $p){
-				if(\is_object($p)===false)
+			foreach ($params as $p) {
+				if (\is_object($p)===false)
 					$items[]=$p;
 			}
 		}

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 $_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 $jsUtils;
 
-	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 ui($ui=NULL) {
@@ -55,9 +55,9 @@ 
 		return $this->_semantic;
 	}
 
-	public function __construct($params,$jsUtils) {
+	public function __construct($params, $jsUtils) {
 		$this->params=array();
-		foreach ( $params as $key => $val ) {
+		foreach ($params as $key => $val) {
 				$this->params[$key]=$params[$key];
 		}
 		$this->jsUtils=$jsUtils;
@@ -125,12 +125,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";
 		}
 	}
@@ -142,12 +142,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;
@@ -161,7 +161,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});";
@@ -179,12 +179,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='';
 		}
 
@@ -212,7 +212,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);
 		}
@@ -226,7 +226,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;
 	}
@@ -266,7 +266,7 @@ 
 
 		// External references
 		$external_scripts=implode('', $this->jquery_code_for_load);
-		extract(array (
+		extract(array(
 				'library_src' => $external_scripts
 		));
 
@@ -281,13 +281,13 @@ 
 		$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);
 
 		if ($view!=NULL)
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
 		return $output;
 	}
 
@@ -301,7 +301,7 @@ 
 	 * @return void
 	 */
 	public function _clear_compile() {
-		$this->jquery_code_for_compile=array ();
+		$this->jquery_code_for_compile=array();
 	}
 
 	/**
@@ -310,12 +310,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;
 		}
 	}
@@ -329,7 +329,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;
@@ -347,14 +347,14 @@ 
 		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;
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if (trim($input)==="") return $input;
 	return preg_replace(
 			array(
 					// Remove comment(s)

Braces +23 added lines, -15 removed lines

@@ -147,10 +147,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;
 	}
 	/**
@@ -165,8 +167,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;
 	}
 
@@ -222,12 +225,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;
 	}
 
@@ -286,8 +291,9 @@ 
 		}
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
 
-		if ($view!=NULL)
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		if ($view!=NULL) {
+					$this->jsUtils->createScriptVariable($view,$view_var, $output);
+		}
 		return $output;
 	}
 
@@ -354,7 +360,9 @@ 
 	}
 
 	private function minify($input) {
-	if(trim($input) === "") return $input;
+	if(trim($input) === "") {
+		return $input;
+	}
 	return preg_replace(
 			array(
 					// Remove comment(s)