Completed
Push — master ( 874c8c...541414 )
by Jean-Christophe
03:49
created
Ajax/bootstrap/html/base/HtmlNavElement.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 	protected $attr;
22 22
 
23 23
 
24
-	public function __construct($identifier,$tagName){
25
-		parent::__construct($identifier,$tagName);
24
+	public function __construct($identifier, $tagName) {
25
+		parent::__construct($identifier, $tagName);
26 26
 		$this->root="";
27 27
 		$this->attr="data-ajax";
28 28
 	}
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param string $targetSelector the target of the get
34 34
 	 * @return HtmlNavElement
35 35
 	 */
36
-	public function autoGetOnClick($targetSelector){
37
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
36
+	public function autoGetOnClick($targetSelector) {
37
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
38 38
 	}
39 39
 
40
-	public function contentAsString(){
40
+	public function contentAsString() {
41 41
 		return implode("", $this->content);
42 42
 	}
43 43
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlBsDoubleElement.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,19 +23,19 @@
 block discarded – undo
23 23
 		return $this;
24 24
 	}
25 25
 
26
-	public function addGlyph($glyphicon,$before=true){
26
+	public function addGlyph($glyphicon, $before=true) {
27 27
 		$glyph=new HtmlGlyphicon("");
28 28
 		$glyph->setGlyphicon($glyphicon);
29
-		$this->addContent($glyph,$before);
29
+		$this->addContent($glyph, $before);
30 30
 		return $this;
31 31
 	}
32 32
 
33
-	public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){
33
+	public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") {
34 34
 		$before=HtmlGlyphicon::getGlyphicon($glyphBefore)." ";
35 35
 		$after="";
36
-		if($glyphAfter!==""){
36
+		if ($glyphAfter!=="") {
37 37
 			$after=" ".HtmlGlyphicon::getGlyphicon($glyphAfter);
38 38
 		}
39
-		return $this->wrapContent($before,$after);
39
+		return $this->wrapContent($before, $after);
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlPanel.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,8 +89,9 @@  discard block
 block discarded – undo
89 89
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
90 90
 	 */
91 91
 	public function setStyle($cssStyle) {
92
-		if (!PhalconUtils::startsWith($cssStyle, "panel"))
93
-			$cssStyle="panel".$cssStyle;
92
+		if (!PhalconUtils::startsWith($cssStyle, "panel")) {
93
+					$cssStyle="panel".$cssStyle;
94
+		}
94 95
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
95 96
 	}
96 97
 
@@ -132,7 +133,8 @@  discard block
 block discarded – undo
132 133
 	 * @return $this default : false
133 134
 	 */
134 135
 	public function show($value) {
135
-		if ($this->_collapsable)
136
-			$this->_showOnStartup=$value;
136
+		if ($this->_collapsable) {
137
+					$this->_showOnStartup=$value;
138
+		}
137 139
 	}
138 140
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlTabItem.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -62,15 +62,15 @@
 block discarded – undo
62 62
 	 */
63 63
 	public function setIdentifier($identifier) {
64 64
 		parent::setIdentifier($identifier);
65
-		if($this->content instanceof HtmlLink){
65
+		if ($this->content instanceof HtmlLink) {
66 66
 			$this->content->setIdentifier("link-".$identifier);
67 67
 		}
68 68
 	}
69
-	public function setActive($value=true){
70
-		$this->setProperty("class", ($value)?"active":"");
69
+	public function setActive($value=true) {
70
+		$this->setProperty("class", ($value) ? "active" : "");
71 71
 	}
72 72
 
73
-	public function disable(){
73
+	public function disable() {
74 74
 		$this->setProperty("class", "disabled");
75 75
 	}
76 76
 }
Please login to merge, or discard this patch.
Ajax/php/micro/JsUtils.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -4,34 +4,34 @@
 block discarded – undo
4 4
 
5 5
 use micro\controllers\Startup;
6 6
 use micro\utils\RequestUtils;
7
-class JsUtils extends \Ajax\JsUtils{
7
+class JsUtils extends \Ajax\JsUtils {
8 8
 
9
-	public function getUrl($url){
9
+	public function getUrl($url) {
10 10
 		return RequestUtils::getUrl($url);
11 11
 	}
12 12
 
13
-	public function addViewElement($identifier,$content,&$view){
13
+	public function addViewElement($identifier, $content, &$view) {
14 14
 		$controls=$view->getVar("q");
15
-		if (isset($controls) === false) {
16
-			$controls=array ();
15
+		if (isset($controls)===false) {
16
+			$controls=array();
17 17
 		}
18 18
 		$controls[$identifier]=$content;
19 19
 		$view->setVar("q", $controls);
20 20
 	}
21 21
 
22
-	public function createScriptVariable(&$view,$view_var, $output){
23
-		$view->setVar($view_var,$output);
22
+	public function createScriptVariable(&$view, $view_var, $output) {
23
+		$view->setVar($view_var, $output);
24 24
 	}
25 25
 
26
-	public function forward($initialController,$controller,$action,$params=array()){
27
-		return $initialController->forward($controller,$action,$params,true,true,true);
26
+	public function forward($initialController, $controller, $action, $params=array()) {
27
+		return $initialController->forward($controller, $action, $params, true, true, true);
28 28
 	}
29 29
 
30
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
31
-		return $initialControllerInstance->loadView($viewName,$params,true);
30
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
31
+		return $initialControllerInstance->loadView($viewName, $params, true);
32 32
 	}
33 33
 
34
-	public function fromDispatcher($dispatcher){
34
+	public function fromDispatcher($dispatcher) {
35 35
 		return Startup::$urlParts;
36 36
 	}
37 37
 }
Please login to merge, or discard this patch.
Ajax/php/laravel/JsUtils.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -4,24 +4,24 @@  discard block
 block discarded – undo
4 4
 
5 5
 use Illuminate\Support\Facades\App;
6 6
 
7
-class JsUtils extends \Ajax\JsUtils{
8
-	public function getUrl($url){
7
+class JsUtils extends \Ajax\JsUtils {
8
+	public function getUrl($url) {
9 9
 		return \url($url);
10 10
 	}
11
-	public function addViewElement($identifier,$content,&$view){
11
+	public function addViewElement($identifier, $content, &$view) {
12 12
 		$controls=$view->__get("q");
13
-		if (isset($controls) === false) {
14
-			$controls=array ();
13
+		if (isset($controls)===false) {
14
+			$controls=array();
15 15
 		}
16 16
 		$controls[$identifier]=$content;
17 17
 		$view->__set("q", $controls);
18 18
 	}
19 19
 
20
-	public function createScriptVariable(&$view,$view_var, $output){
21
-		$view->__set($view_var,$output);
20
+	public function createScriptVariable(&$view, $view_var, $output) {
21
+		$view->__set($view_var, $output);
22 22
 	}
23 23
 
24
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
24
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
25 25
 		\ob_start();
26 26
 		App::make($controllerName)->{$actionName}($params);
27 27
 		$result=\ob_get_contents();
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 		return $result;
30 30
 	}
31 31
 
32
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
33
-		return \view()->make($viewName,$params)->render();
32
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
33
+		return \view()->make($viewName, $params)->render();
34 34
 	}
35 35
 
36
-	public function fromDispatcher($dispatcher){
36
+	public function fromDispatcher($dispatcher) {
37 37
 		return $dispatcher->segments();
38 38
 	}
39 39
 }
Please login to merge, or discard this patch.
Ajax/service/JQueryAjaxEffect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\service;
3 3
 class JQueryAjaxEffect {
4
-	public static function none($responseElement,$jqueryDone="html"){
4
+	public static function none($responseElement, $jqueryDone="html") {
5 5
 		return "\t$({$responseElement}).{$jqueryDone}( data );\n";
6 6
 	}
7 7
 
8
-	public static function fade($responseElement,$jqueryDone="html"){
8
+	public static function fade($responseElement, $jqueryDone="html") {
9 9
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n";
10 10
 	}
11 11
 
12
-	public static function slide($responseElement,$jqueryDone="html"){
12
+	public static function slide($responseElement, $jqueryDone="html") {
13 13
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n";
14 14
 	}
15 15
 }
Please login to merge, or discard this patch.
Ajax/common/html/traits/NavElementTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -8,22 +8,22 @@  discard block
 block discarded – undo
8 8
  * @property string $root
9 9
  * @property string $attr
10 10
  */
11
-trait NavElementTrait{
11
+trait NavElementTrait {
12 12
 
13 13
 	abstract public function contentAsString();
14 14
 	/**
15 15
 	 * Generate the jquery script to set the elements to the HtmlNavElement
16 16
 	 * @param JsUtils $jsUtils
17 17
 	 */
18
-	public function jsSetContent(JsUtils $jsUtils){
19
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
18
+	public function jsSetContent(JsUtils $jsUtils) {
19
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
20 20
 	}
21 21
 
22 22
 	public function getRoot() {
23 23
 		return $this->root;
24 24
 	}
25 25
 	public function setRoot($root) {
26
-		$this->root = $root;
26
+		$this->root=$root;
27 27
 		return $this;
28 28
 	}
29 29
 	public function getAttr() {
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
36 36
 	 * @return HtmlNavElement
37 37
 	 */
38 38
 	public function setAttr($attr) {
39
-		$this->attr = $attr;
39
+		$this->attr=$attr;
40 40
 		return $this;
41 41
 	}
42 42
 
43 43
 	public function __call($method, $args) {
44
-		if(isset($this->$method) && is_callable($this->$method)) {
44
+		if (isset($this->$method) && is_callable($this->$method)) {
45 45
 			return call_user_func_array(
46 46
 					$this->$method,
47 47
 					$args
@@ -49,5 +49,5 @@  discard block
 block discarded – undo
49 49
 		}
50 50
 	}
51 51
 
52
-	abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0);
52
+	abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0);
53 53
 }
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 2 patches
Braces   +32 added lines, -24 removed lines patch added patch discarded remove patch
@@ -29,8 +29,9 @@  discard block
 block discarded – undo
29 29
 		}
30 30
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
31 31
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
32
-		if ($immediatly)
33
-			$this->jquery_code_for_compile[]=$retour;
32
+		if ($immediatly) {
33
+					$this->jquery_code_for_compile[]=$retour;
34
+		}
34 35
 			return $retour;
35 36
 	}
36 37
 
@@ -40,15 +41,17 @@  discard block
 block discarded – undo
40 41
 		$url=$this->_correctAjaxUrl($url);
41 42
 		$retour="url='".$url."';";
42 43
 		$slash="/";
43
-		if(JString::endswith($url, "/")===true)
44
-			$slash="";
44
+		if(JString::endswith($url, "/")===true) {
45
+					$slash="";
46
+		}
45 47
 			if(JString::isNotNull($attr)){
46
-				if ($attr==="value")
47
-					$retour.="url=url+'".$slash."'+$(this).val();\n";
48
-				elseif ($attr==="html")
49
-					$retour.="url=url+'".$slash."'+$(this).html();\n";
50
-				elseif($attr!==null && $attr!=="")
51
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
48
+				if ($attr==="value") {
49
+									$retour.="url=url+'".$slash."'+$(this).val();\n";
50
+				} elseif ($attr==="html") {
51
+									$retour.="url=url+'".$slash."'+$(this).html();\n";
52
+				} elseif($attr!==null && $attr!=="") {
53
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
54
+				}
52 55
 			}
53 56
 			return $retour;
54 57
 	}
@@ -58,13 +61,14 @@  discard block
 block discarded – undo
58 61
 		if ($responseElement!=="") {
59 62
 			if(isset($ajaxTransition)){
60 63
 				$call=$this->setAjaxDataCall($ajaxTransition);
61
-			}elseif(isset($this->ajaxTransition)){
64
+			} elseif(isset($this->ajaxTransition)){
62 65
 				$call=$this->ajaxTransition;
63 66
 			}
64
-			if(\is_callable($call))
65
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
66
-				else
67
-					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
67
+			if(\is_callable($call)) {
68
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
69
+			} else {
70
+									$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
71
+				}
68 72
 		}
69 73
 		$retour.="\t".$jsCallback."\n";
70 74
 		return $retour;
@@ -78,8 +82,9 @@  discard block
 block discarded – undo
78 82
 	}
79 83
 
80 84
 	protected function _correctAjaxUrl($url) {
81
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
82
-			$url=substr($url, 0, strlen($url)-1);
85
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
86
+					$url=substr($url, 0, strlen($url)-1);
87
+		}
83 88
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
84 89
 				$url=$this->getUrl($url);
85 90
 			}
@@ -159,8 +164,9 @@  discard block
 block discarded – undo
159 164
 				$retour.="\t".$jsCallback."\n".
160 165
 						"\t$(document).trigger('jsonReady',[data]);\n".
161 166
 						"});\n";
162
-				if ($immediatly)
163
-					$this->jquery_code_for_compile[]=$retour;
167
+				if ($immediatly) {
168
+									$this->jquery_code_for_compile[]=$retour;
169
+				}
164 170
 		return $retour;
165 171
 	}
166 172
 
@@ -225,7 +231,7 @@  discard block
 block discarded – undo
225 231
 		if($context===null){
226 232
 			$parent="$('".$maskSelector."').parent()";
227 233
 			$newElm = "$('#'+newId)";
228
-		}else{
234
+		} else{
229 235
 			$parent=$context;
230 236
 			$newElm = $context.".find('#'+newId)";
231 237
 		}
@@ -238,8 +244,9 @@  discard block
 block discarded – undo
238 244
 		$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";
239 245
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
240 246
 		$retour.="\t".$jsCallback."\n"."});\n";
241
-		if ($immediatly)
242
-			$this->jquery_code_for_compile[]=$retour;
247
+		if ($immediatly) {
248
+					$this->jquery_code_for_compile[]=$retour;
249
+		}
243 250
 		return $retour;
244 251
 	}
245 252
 
@@ -430,8 +437,9 @@  discard block
 block discarded – undo
430 437
 			}});\n";
431 438
 			$retour.="$('#".$form."').submit();\n";
432 439
 		}
433
-		if ($immediatly)
434
-			$this->jquery_code_for_compile[]=$retour;
440
+		if ($immediatly) {
441
+					$this->jquery_code_for_compile[]=$retour;
442
+		}
435 443
 		return $retour;
436 444
 	}
437 445
 
Please login to merge, or discard this patch.
Spacing   +64 added lines, -64 removed lines patch added patch discarded remove patch
@@ -16,19 +16,19 @@  discard block
 block discarded – undo
16 16
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
17 17
 
18 18
 	abstract public function getUrl($url);
19
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
19
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
20 20
 
21
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
22
-		if(JString::isNull($params)){$params="{}";}
21
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
22
+		if (JString::isNull($params)) {$params="{}"; }
23 23
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
24 24
 		$retour=$this->_getAjaxUrl($url, $attr);
25 25
 		$responseElement=$this->_getResponseElement($responseElement);
26 26
 		$retour.="var self=this;\n";
27
-		if($hasLoader===true){
27
+		if ($hasLoader===true) {
28 28
 			$this->addLoading($retour, $responseElement);
29 29
 		}
30 30
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
31
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
31
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
32 32
 		if ($immediatly)
33 33
 			$this->jquery_code_for_compile[]=$retour;
34 34
 			return $retour;
@@ -36,33 +36,33 @@  discard block
 block discarded – undo
36 36
 
37 37
 
38 38
 
39
-	protected function _getAjaxUrl($url,$attr){
39
+	protected function _getAjaxUrl($url, $attr) {
40 40
 		$url=$this->_correctAjaxUrl($url);
41 41
 		$retour="url='".$url."';";
42 42
 		$slash="/";
43
-		if(JString::endswith($url, "/")===true)
43
+		if (JString::endswith($url, "/")===true)
44 44
 			$slash="";
45
-			if(JString::isNotNull($attr)){
45
+			if (JString::isNotNull($attr)) {
46 46
 				if ($attr==="value")
47 47
 					$retour.="url=url+'".$slash."'+$(this).val();\n";
48 48
 				elseif ($attr==="html")
49 49
 					$retour.="url=url+'".$slash."'+$(this).html();\n";
50
-				elseif($attr!==null && $attr!=="")
50
+				elseif ($attr!==null && $attr!=="")
51 51
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
52 52
 			}
53 53
 			return $retour;
54 54
 	}
55 55
 
56
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){
57
-		$retour="";$call=null;
56
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) {
57
+		$retour=""; $call=null;
58 58
 		if ($responseElement!=="") {
59
-			if(isset($ajaxTransition)){
59
+			if (isset($ajaxTransition)) {
60 60
 				$call=$this->setAjaxDataCall($ajaxTransition);
61
-			}elseif(isset($this->ajaxTransition)){
61
+			}elseif (isset($this->ajaxTransition)) {
62 62
 				$call=$this->ajaxTransition;
63 63
 			}
64
-			if(\is_callable($call))
65
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
64
+			if (\is_callable($call))
65
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
66 66
 				else
67 67
 					$retour="\t$({$responseElement}).{$jqueryDone}( data );\n";
68 68
 		}
@@ -70,7 +70,7 @@  discard block
 block discarded – undo
70 70
 		return $retour;
71 71
 	}
72 72
 
73
-	protected function _getResponseElement($responseElement){
73
+	protected function _getResponseElement($responseElement) {
74 74
 		if ($responseElement!=="") {
75 75
 			$responseElement=Javascript::prep_value($responseElement);
76 76
 		}
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
 	protected function _correctAjaxUrl($url) {
81 81
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
82 82
 			$url=substr($url, 0, strlen($url)-1);
83
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
83
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
84 84
 				$url=$this->getUrl($url);
85 85
 			}
86 86
 			return $url;
@@ -98,11 +98,11 @@  discard block
 block discarded – undo
98 98
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
99 99
 	}
100 100
 
101
-	protected function setAjaxDataCall($params){
101
+	protected function setAjaxDataCall($params) {
102 102
 		$result=null;
103
-		if(!\is_callable($params)){
104
-			$result=function ($responseElement,$jqueryDone="html") use($params){
105
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
103
+		if (!\is_callable($params)) {
104
+			$result=function($responseElement, $jqueryDone="html") use($params){
105
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
106 106
 			};
107 107
 		}
108 108
 		return $result;
@@ -122,8 +122,8 @@  discard block
 block discarded – undo
122 122
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
123 123
 	 * @param string|callable $ajaxTransition
124 124
 	 */
125
-	private function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
126
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
125
+	private function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
126
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
127 127
 	}
128 128
 
129 129
 	/**
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
137 137
 	 * @param string|callable $ajaxTransition
138 138
 	 */
139
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
140
-		return $this->_get($url,$params,$responseElement,$jsCallback,null,$hasLoader,$jqueryDone,$ajaxTransition,true);
139
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
140
+		return $this->_get($url, $params, $responseElement, $jsCallback, null, $hasLoader, $jqueryDone, $ajaxTransition, true);
141 141
 	}
142 142
 
143 143
 	/**
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * @param string $context
151 151
 	 * @param boolean $immediatly
152 152
 	 */
153
-	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
153
+	private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
154 154
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
155 155
 		$retour=$this->_getAjaxUrl($url, $attr);
156 156
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -173,8 +173,8 @@  discard block
 block discarded – undo
173 173
 	 * @param string $context
174 174
 	 * @param boolean $immediatly
175 175
 	 */
176
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL,$context="document",$immediatly=false) {
177
-		return $this->_json($url,$method,$params,$jsCallback,NULL,$context,$immediatly);
176
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $context="document", $immediatly=false) {
177
+		return $this->_json($url, $method, $params, $jsCallback, NULL, $context, $immediatly);
178 178
 	}
179 179
 
180 180
 	/**
@@ -184,7 +184,7 @@  discard block
 block discarded – undo
184 184
 	 * @param string $url the request address
185 185
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
186 186
 	 */
187
-	public function jsonOn($event,$element, $url,$parameters=array()) {
187
+	public function jsonOn($event, $element, $url, $parameters=array()) {
188 188
 		$preventDefault=true;
189 189
 		$stopPropagation=true;
190 190
 		$jsCallback=null;
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 		$params="{}";
195 195
 		$immediatly=true;
196 196
 		extract($parameters);
197
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
197
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
198 198
 	}
199 199
 
200 200
 	/**
@@ -205,8 +205,8 @@  discard block
 block discarded – undo
205 205
 	 * @param string $jsCallback javascript code to execute after the request
206 206
 	 * @param string $context jquery DOM element, array container.
207 207
 	 */
208
-	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL,$context=NULL) {
209
-		return $this->json($url, $method, $params, $jsCallback, $context,false);
208
+	public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL, $context=NULL) {
209
+		return $this->json($url, $method, $params, $jsCallback, $context, false);
210 210
 	}
211 211
 
212 212
 	/**
@@ -219,22 +219,22 @@  discard block
 block discarded – undo
219 219
 	 * @param string $rowClass the css class for the new element
220 220
 	 * @param boolean $immediatly
221 221
 	 */
222
-	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$attr="id",$immediatly=false) {
222
+	private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $attr="id", $immediatly=false) {
223 223
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
224 224
 		$retour=$this->_getAjaxUrl($url, $attr);
225
-		if($context===null){
225
+		if ($context===null) {
226 226
 			$parent="$('".$maskSelector."').parent()";
227
-			$newElm = "$('#'+newId)";
228
-		}else{
227
+			$newElm="$('#'+newId)";
228
+		} else {
229 229
 			$parent=$context;
230
-			$newElm = $context.".find('#'+newId)";
230
+			$newElm=$context.".find('#'+newId)";
231 231
 		}
232 232
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
233 233
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
234 234
 		$retour.=$parent.".find('._json').remove();";
235 235
 		$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=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone();
236 236
 		newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n";
237
-		$retour.= $appendTo;
237
+		$retour.=$appendTo;
238 238
 		$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";
239 239
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
240 240
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -253,8 +253,8 @@  discard block
 block discarded – undo
253 253
 	 * @param string $context jquery DOM element, array container.
254 254
 	 * @param boolean $immediatly
255 255
 	 */
256
-	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$immediatly=false) {
257
-		return $this->_jsonArray($maskSelector, $url,$method,$params,$jsCallback,$rowClass,$context,NULL,$immediatly);
256
+	public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $immediatly=false) {
257
+		return $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, NULL, $immediatly);
258 258
 	}
259 259
 
260 260
 	/**
@@ -267,8 +267,8 @@  discard block
 block discarded – undo
267 267
 	 * @param string $rowClass the css class for the new element
268 268
 	 * @param string $context jquery DOM element, array container.
269 269
 	 */
270
-	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL) {
271
-		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback,$rowClass,$context,false);
270
+	public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL) {
271
+		return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, false);
272 272
 	}
273 273
 
274 274
 	/**
@@ -278,18 +278,18 @@  discard block
 block discarded – undo
278 278
 	 * @param string $url the request url
279 279
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
280 280
 	 */
281
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
281
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
282 282
 		$preventDefault=true;
283 283
 		$stopPropagation=true;
284 284
 		$jsCallback=null;
285 285
 		$attr="id";
286 286
 		$method="get";
287
-		$context = null;
287
+		$context=null;
288 288
 		$params="{}";
289 289
 		$immediatly=true;
290 290
 		$rowClass="_json";
291 291
 		extract($parameters);
292
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $rowClass, $context,$attr), $event, $preventDefault, $stopPropagation,$immediatly);
292
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, $attr), $event, $preventDefault, $stopPropagation, $immediatly);
293 293
 	}
294 294
 
295 295
 	/**
@@ -303,8 +303,8 @@  discard block
 block discarded – undo
303 303
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
304 304
 	 * @param string|callable $ajaxTransition
305 305
 	 */
306
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id",$jqueryDone="html",$ajaxTransition=null) {
307
-		return $this->_get($url, $params,$responseElement,$jsCallback,$attr,false,$jqueryDone,$ajaxTransition);
306
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $jqueryDone="html", $ajaxTransition=null) {
307
+		return $this->_get($url, $params, $responseElement, $jsCallback, $attr, false, $jqueryDone, $ajaxTransition);
308 308
 	}
309 309
 
310 310
 	/**
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 		$ajaxTransition=null;
328 328
 		$params="{}";
329 329
 		extract($parameters);
330
-		return $this->_add_event($element, $this->_get($url, $params,$responseElement,$jsCallback,$attr, $hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
330
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
331 331
 	}
332 332
 
333 333
 	/**
@@ -342,8 +342,8 @@  discard block
 block discarded – undo
342 342
 		return $this->getOn("click", $element, $url, $responseElement, $parameters);
343 343
 	}
344 344
 
345
-	private function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
346
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$jqueryDone,$ajaxTransition,$immediatly);
345
+	private function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
346
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, $immediatly);
347 347
 	}
348 348
 
349 349
 	/**
@@ -356,8 +356,8 @@  discard block
 block discarded – undo
356 356
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
357 357
 	 * @param string|callable $ajaxTransition
358 358
 	 */
359
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
360
-		return $this->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
359
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
360
+		return $this->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
361 361
 	}
362 362
 
363 363
 	/**
@@ -372,8 +372,8 @@  discard block
 block discarded – undo
372 372
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
373 373
 	 * @param string|callable $ajaxTransition
374 374
 	 */
375
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
376
-		return $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
375
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
376
+		return $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
377 377
 	}
378 378
 
379 379
 	/**
@@ -396,7 +396,7 @@  discard block
 block discarded – undo
396 396
 		$jqueryDone="html";
397 397
 		$ajaxTransition=null;
398 398
 		extract($parameters);
399
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
399
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
400 400
 	}
401 401
 
402 402
 	/**
@@ -412,20 +412,20 @@  discard block
 block discarded – undo
412 412
 		return $this->postOn("click", $element, $url, $params, $responseElement, $parameters);
413 413
 	}
414 414
 
415
-	private function _postForm($url, $form, $responseElement, $params=null,$validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$jqueryDone="html",$ajaxTransition=null,$immediatly=false) {
415
+	private function _postForm($url, $form, $responseElement, $params=null, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null, $immediatly=false) {
416 416
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
417 417
 		$retour=$this->_getAjaxUrl($url, $attr);
418 418
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
419
-		if(isset($params)){
419
+		if (isset($params)) {
420 420
 			$retour.="params+='&'+$.param(".$params.");\n";
421 421
 		}
422 422
 		$responseElement=$this->_getResponseElement($responseElement);
423 423
 		$retour.="var self=this;\n";
424
-		if($hasLoader===true){
424
+		if ($hasLoader===true) {
425 425
 			$this->addLoading($retour, $responseElement);
426 426
 		}
427 427
 		$retour.="$.post(url,params).done(function( data ) {\n";
428
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n";
428
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n";
429 429
 
430 430
 		if ($validation) {
431 431
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -449,8 +449,8 @@  discard block
 block discarded – undo
449 449
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
450 450
 	 * @param string|callable $ajaxTransition
451 451
 	 */
452
-	public function postForm($url, $form, $responseElement, $params=NULL,$validation=false, $jsCallback=NULL,$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
453
-		return $this->_postForm($url, $form, $responseElement, $params,$validation, $jsCallback, NULL, $hasLoader,$jqueryDone,$ajaxTransition,true);
452
+	public function postForm($url, $form, $responseElement, $params=NULL, $validation=false, $jsCallback=NULL, $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
453
+		return $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, NULL, $hasLoader, $jqueryDone, $ajaxTransition, true);
454 454
 	}
455 455
 
456 456
 	/**
@@ -467,8 +467,8 @@  discard block
 block discarded – undo
467 467
 	 * @param string $jqueryDone the jquery function call on ajax data. default:html
468 468
 	 * @param string|callable $ajaxTransition
469 469
 	 */
470
-	public function postFormDeferred($url, $form, $responseElement, $params=NULL,$validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true,$jqueryDone="html",$ajaxTransition=null) {
471
-		return $this->_postForm($url, $form, $responseElement, $params,$validation, $jsCallback, $attr, $hasLoader,$jqueryDone,$ajaxTransition,false);
470
+	public function postFormDeferred($url, $form, $responseElement, $params=NULL, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $jqueryDone="html", $ajaxTransition=null) {
471
+		return $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition, false);
472 472
 	}
473 473
 
474 474
 	/**
@@ -493,7 +493,7 @@  discard block
 block discarded – undo
493 493
 		$jqueryDone="html";
494 494
 		$ajaxTransition=null;
495 495
 		extract($parameters);
496
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement,$params, $validation, $jsCallback, $attr,$hasLoader,$jqueryDone,$ajaxTransition), $event, $preventDefault, $stopPropagation,$immediatly);
496
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $params, $validation, $jsCallback, $attr, $hasLoader, $jqueryDone, $ajaxTransition), $event, $preventDefault, $stopPropagation, $immediatly);
497 497
 	}
498 498
 
499 499
 	/**
Please login to merge, or discard this patch.