Completed
Push — master ( 49f42f...848ec5 )
by Jean-Christophe
03:06
created
Ajax/bootstrap/html/content/HtmlGridCol.php 1 patch
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -15,22 +15,22 @@  discard block
 block discarded – undo
15 15
 class HtmlGridCol extends HtmlBsDoubleElement {
16 16
 	private $positions;
17 17
 	private $offsets;
18
-	public function __construct($identifier,$size=CssSize::SIZE_MD,$width=1){
19
-		parent::__construct($identifier,"div");
18
+	public function __construct($identifier, $size=CssSize::SIZE_MD, $width=1) {
19
+		parent::__construct($identifier, "div");
20 20
 		$this->positions=array();
21 21
 		$this->offsets=array();
22
-		$this->addPosition($size,$width);
22
+		$this->addPosition($size, $width);
23 23
 	}
24
-	public function addPosition($size=CssSize::SIZE_MD,$width=1){
24
+	public function addPosition($size=CssSize::SIZE_MD, $width=1) {
25 25
 		$this->positions[$size]=$width;
26 26
 		return $this;
27 27
 	}
28
-	private function _generateClass(){
28
+	private function _generateClass() {
29 29
 		$result=array();
30
-		foreach ($this->positions as $size=>$width){
30
+		foreach ($this->positions as $size=>$width) {
31 31
 			$result[]="col-".$size."-".$width;
32 32
 		}
33
-		foreach ($this->offsets as $size=>$offset){
33
+		foreach ($this->offsets as $size=>$offset) {
34 34
 			$result[]="col-".$size."-offset-".$offset;
35 35
 		}
36 36
 		return implode(" ", $result);
@@ -38,63 +38,63 @@  discard block
 block discarded – undo
38 38
 
39 39
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
40 40
 		$this->setProperty("class", $this->_generateClass());
41
-		return parent::compile($js,$view);
41
+		return parent::compile($js, $view);
42 42
 	}
43 43
 
44
-	public function setOffset($size,$offset){
44
+	public function setOffset($size, $offset) {
45 45
 		$this->offsets[$size]=$offset;
46 46
 		return $this;
47 47
 	}
48 48
 
49
-	public function setOffsetForAll($newOffset){
50
-		foreach ($this->offsets as &$value){
49
+	public function setOffsetForAll($newOffset) {
50
+		foreach ($this->offsets as &$value) {
51 51
 			$value=$newOffset;
52 52
 		}
53 53
 		unset($value);
54 54
 		return $this;
55 55
 	}
56 56
 
57
-	public function setWidthForAll($newWidth){
58
-		foreach ($this->positions as &$pos){
57
+	public function setWidthForAll($newWidth) {
58
+		foreach ($this->positions as &$pos) {
59 59
 			$pos=$newWidth;
60 60
 		}
61 61
 		unset($pos);
62 62
 		return $this;
63 63
 	}
64 64
 
65
-	public function setWidth($size=CssSize::SIZE_MD,$width=1){
65
+	public function setWidth($size=CssSize::SIZE_MD, $width=1) {
66 66
 		$this->positions[$size]=$width;
67 67
 		return $this;
68 68
 	}
69 69
 
70
-	public function setPosition($size=CssSize::SIZE_MD,$width=1){
71
-		return $this->addPosition($size,$width);
70
+	public function setPosition($size=CssSize::SIZE_MD, $width=1) {
71
+		return $this->addPosition($size, $width);
72 72
 	}
73 73
 
74
-	public function getWidth($size){
74
+	public function getWidth($size) {
75 75
 		return @$this->positions[$size];
76 76
 	}
77 77
 
78
-	public function getOffest($size){
78
+	public function getOffest($size) {
79 79
 		return @$this->offsets[$size];
80 80
 	}
81 81
 
82
-	public function addClear(){
83
-		$this->wrap("","<div class='clearfix'></div>");
82
+	public function addClear() {
83
+		$this->wrap("", "<div class='clearfix'></div>");
84 84
 	}
85 85
 	public function setOffsets($offsets) {
86
-		$this->offsets = $offsets;
86
+		$this->offsets=$offsets;
87 87
 		return $this;
88 88
 	}
89 89
 
90
-	public function copy($identifier){
90
+	public function copy($identifier) {
91 91
 		$result=new HtmlGridCol($identifier);
92 92
 		$result->setPositions($this->positions);
93 93
 		$result->setOffsets($this->offsets);
94 94
 		return $result;
95 95
 	}
96 96
 	public function setPositions($positions) {
97
-		$this->positions = $positions;
97
+		$this->positions=$positions;
98 98
 		return $this;
99 99
 	}
100 100
 	public function getOffsets() {
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlAccordion.php 3 patches
Indentation   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -50,14 +50,14 @@
 block discarded – undo
50 50
 	}
51 51
 
52 52
 		/**
53
-	 * render the content of $controller::$action and set the response to a new panel
54
-	 * @param JsUtils $js
55
-	 * @param string $title The panel title
56
-	 * @param Controller $initialController
57
-	 * @param string $controller a Phalcon controller
58
-	 * @param string $action a Phalcon action
59
-	 * @param array $params
60
-	 */
53
+		 * render the content of $controller::$action and set the response to a new panel
54
+		 * @param JsUtils $js
55
+		 * @param string $title The panel title
56
+		 * @param Controller $initialController
57
+		 * @param string $controller a Phalcon controller
58
+		 * @param string $action a Phalcon action
59
+		 * @param array $params
60
+		 */
61 61
 	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
62 62
 		return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params));
63 63
 	}
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		$this->setClass("panel-group");
20 20
 		$this->setRole("tablist");
21 21
 		$this->setProperty("aria-multiselectable", "true");
22
-		$this->content=array ();
22
+		$this->content=array();
23 23
 	}
24 24
 
25 25
 	public function addPanel($title, $content) {
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @param string $viewName
46 46
 	 * @param $params The parameters to pass to the view
47 47
 	 */
48
-	public function renderViewPanel(JsUtils $js,$title,$initialController, $viewName, $params=array()) {
49
-		return $this->addPanel($title, $js->renderContent($initialController, $viewName,$params));
48
+	public function renderViewPanel(JsUtils $js, $title, $initialController, $viewName, $params=array()) {
49
+		return $this->addPanel($title, $js->renderContent($initialController, $viewName, $params));
50 50
 	}
51 51
 
52 52
 		/**
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
 	 * @param string $action a Phalcon action
59 59
 	 * @param array $params
60 60
 	 */
61
-	public function forwardPanel(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){
62
-		return $this->addPanel($title, $js->forward($initialController, $controller, $action,$params));
61
+	public function forwardPanel(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) {
62
+		return $this->addPanel($title, $js->forward($initialController, $controller, $action, $params));
63 63
 	}
64 64
 
65 65
 	public function run(JsUtils $js) {
66
-		foreach ( $this->content as $content ) {
66
+		foreach ($this->content as $content) {
67 67
 			$content->run($js);
68 68
 		}
69 69
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -69,7 +69,8 @@
 block discarded – undo
69 69
 	}
70 70
 
71 71
 	public function getPanel($index) {
72
-		if ($index<sizeof($this->content))
73
-			return $this->content [$index];
72
+		if ($index<sizeof($this->content)) {
73
+					return $this->content [$index];
74
+		}
74 75
 	}
75 76
 }
76 77
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryAjaxTrait.php 2 patches
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 	protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>';
11 11
 
12 12
 	public abstract function _prep_value($value);
13
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 	protected function addLoading(&$retour, $responseElement) {
15 15
 		$loading_notifier='<div class="ajax-loader">';
16 16
 		if ($this->ajaxLoader=='') {
@@ -23,20 +23,20 @@  discard block
 block discarded – undo
23 23
 		$retour.="\t\t$({$responseElement}).prepend('{$loading_notifier}');\n";
24 24
 	}
25 25
 
26
-	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
27
-		return $this->_ajax("get", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
26
+	public function _get($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
27
+		return $this->_ajax("get", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
28 28
 	}
29
-	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
30
-		return $this->_ajax("post", $url,$params,$responseElement,$jsCallback,$attr,$hasLoader,$immediatly);
29
+	public function _post($url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
30
+		return $this->_ajax("post", $url, $params, $responseElement, $jsCallback, $attr, $hasLoader, $immediatly);
31 31
 	}
32 32
 
33
-	protected function _ajax($method,$url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
34
-		if(JString::isNull($params)){$params="{}";}
33
+	protected function _ajax($method, $url, $params="{}", $responseElement="", $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
34
+		if (JString::isNull($params)) {$params="{}"; }
35 35
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
36 36
 		$retour=$this->_getAjaxUrl($url, $attr);
37 37
 		$responseElement=$this->_getResponseElement($responseElement);
38 38
 		$retour.="var self=this;\n";
39
-		if($hasLoader===true){
39
+		if ($hasLoader===true) {
40 40
 			$this->addLoading($retour, $responseElement);
41 41
 		}
42 42
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
@@ -46,22 +46,22 @@  discard block
 block discarded – undo
46 46
 			return $retour;
47 47
 	}
48 48
 
49
-	protected function _getAjaxUrl($url,$attr){
49
+	protected function _getAjaxUrl($url, $attr) {
50 50
 		$url=$this->_correctAjaxUrl($url);
51 51
 		$retour="url='".$url."';\n";
52 52
 		$slash="/";
53
-		if(JString::endswith($url, "/")===true)
53
+		if (JString::endswith($url, "/")===true)
54 54
 			$slash="";
55
-		if(JString::isNotNull($attr)){
55
+		if (JString::isNotNull($attr)) {
56 56
 			if ($attr=="value")
57 57
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
58
-				else if($attr!=null && $attr!=="")
58
+				else if ($attr!=null && $attr!=="")
59 59
 					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
60 60
 		}
61 61
 		return $retour;
62 62
 	}
63 63
 
64
-	protected function _getOnAjaxDone($responseElement,$jsCallback){
64
+	protected function _getOnAjaxDone($responseElement, $jsCallback) {
65 65
 		$retour="";
66 66
 		if ($responseElement!=="") {
67 67
 			$retour="\t$({$responseElement}).html( data );\n";
@@ -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=$this->_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->jsUtils->getUrl($url);
85 85
 		}
86 86
 		return $url;
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
94 94
 	 * @param string $jsCallback javascript code to execute after the request
95 95
 	 * @param boolean $immediatly
96 96
 	 */
97
-	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
97
+	public function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
98 98
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
99 99
 		$retour=$this->_getAjaxUrl($url, $attr);
100 100
 		$retour.="$.{$method}(url,".$params.").done(function( data ) {\n";
@@ -115,7 +115,7 @@  discard block
 block discarded – undo
115 115
 	 * @param string $url the request address
116 116
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
117 117
 	 */
118
-	public function _jsonOn($event,$element, $url,$parameters=array()) {
118
+	public function _jsonOn($event, $element, $url, $parameters=array()) {
119 119
 		$preventDefault=true;
120 120
 		$stopPropagation=true;
121 121
 		$jsCallback=null;
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$params="{}";
126 126
 		$immediatly=true;
127 127
 		extract($parameters);
128
-		return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly);
128
+		return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
129 129
 	}
130 130
 
131 131
 	/**
@@ -137,19 +137,19 @@  discard block
 block discarded – undo
137 137
 	 * @param string $context jquery DOM element, array container.
138 138
 	 * @param boolean $immediatly
139 139
 	 */
140
-	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null,$immediatly=false) {
140
+	public function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context=null, $immediatly=false) {
141 141
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
142 142
 		$retour=$this->_getAjaxUrl($url, $attr);
143
-		if($context===null){
143
+		if ($context===null) {
144 144
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
145
-			$newElm = "$('#'+newId)";
146
-		}else{
145
+			$newElm="$('#'+newId)";
146
+		} else {
147 147
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
148
-			$newElm = $context.".find('#'+newId)";
148
+			$newElm=$context.".find('#'+newId)";
149 149
 		}
150 150
 		$retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n";
151 151
 		$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();newElm.attr('id',newId);\n";
152
-		$retour.= $appendTo;
152
+		$retour.=$appendTo;
153 153
 		$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";
154 154
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
155 155
 		$retour.="\t".$jsCallback."\n"."});\n";
@@ -164,26 +164,26 @@  discard block
 block discarded – undo
164 164
 	 * @param string $url the request address
165 165
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get", "context"=>null)
166 166
 	 */
167
-	public function _jsonArrayOn($event,$element, $maskSelector,$url,$parameters=array()) {
167
+	public function _jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
168 168
 		$preventDefault=true;
169 169
 		$stopPropagation=true;
170 170
 		$jsCallback=null;
171 171
 		$attr="id";
172 172
 		$method="get";
173
-		$context = null;
173
+		$context=null;
174 174
 		$params="{}";
175 175
 		$immediatly=true;
176 176
 		extract($parameters);
177
-		return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation,$immediatly);
177
+		return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly);
178 178
 	}
179 179
 
180
-	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true,$immediatly=false) {
180
+	public function _postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true, $immediatly=false) {
181 181
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
182 182
 		$retour=$this->_getAjaxUrl($url, $attr);
183 183
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
184 184
 		$responseElement=$this->_getResponseElement($responseElement);
185 185
 		$retour.="var self=this;\n";
186
-		if($hasLoader===true){
186
+		if ($hasLoader===true) {
187 187
 			$this->addLoading($retour, $responseElement);
188 188
 		}
189 189
 		$retour.="$.post(url,params).done(function( data ) {\n";
@@ -210,7 +210,7 @@  discard block
 block discarded – undo
210 210
 	 * @param string $responseElement
211 211
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
212 212
 	 */
213
-	public function _getOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
213
+	public function _getOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
214 214
 		$preventDefault=true;
215 215
 		$stopPropagation=true;
216 216
 		$jsCallback=null;
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 		$hasLoader=true;
219 219
 		$immediatly=true;
220 220
 		extract($parameters);
221
-		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
221
+		return $this->_add_event($element, $this->_get($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
222 222
 	}
223 223
 
224 224
 	/**
@@ -231,7 +231,7 @@  discard block
 block discarded – undo
231 231
 	 * @param string $responseElement
232 232
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true)
233 233
 	 */
234
-	public function _postOn($event,$element, $url, $params="{}", $responseElement="", $parameters=array()) {
234
+	public function _postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
235 235
 		$preventDefault=true;
236 236
 		$stopPropagation=true;
237 237
 		$jsCallback=null;
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 		$hasLoader=true;
240 240
 		$immediatly=true;
241 241
 		extract($parameters);
242
-		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
242
+		return $this->_add_event($element, $this->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
243 243
 	}
244 244
 
245 245
 	/**
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @param string $responseElement
253 253
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
254 254
 	 */
255
-	public function _postFormOn($event,$element, $url, $form, $responseElement="", $parameters=array()) {
255
+	public function _postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
256 256
 		$preventDefault=true;
257 257
 		$stopPropagation=true;
258 258
 		$validation=false;
@@ -261,6 +261,6 @@  discard block
 block discarded – undo
261 261
 		$hasLoader=true;
262 262
 		$immediatly=true;
263 263
 		extract($parameters);
264
-		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr,$hasLoader), $event, $preventDefault, $stopPropagation,$immediatly);
264
+		return $this->_add_event($element, $this->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader), $event, $preventDefault, $stopPropagation, $immediatly);
265 265
 	}
266 266
 }
267 267
\ No newline at end of file
Please login to merge, or discard this patch.
Braces   +24 added lines, -17 removed lines patch added patch discarded remove patch
@@ -41,8 +41,9 @@  discard block
 block discarded – undo
41 41
 		}
42 42
 		$retour.="$.".$method."(url,".$params.").done(function( data ) {\n";
43 43
 		$retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n";
44
-		if ($immediatly)
45
-			$this->jquery_code_for_compile[]=$retour;
44
+		if ($immediatly) {
45
+					$this->jquery_code_for_compile[]=$retour;
46
+		}
46 47
 			return $retour;
47 48
 	}
48 49
 
@@ -50,13 +51,15 @@  discard block
 block discarded – undo
50 51
 		$url=$this->_correctAjaxUrl($url);
51 52
 		$retour="url='".$url."';\n";
52 53
 		$slash="/";
53
-		if(JString::endswith($url, "/")===true)
54
-			$slash="";
54
+		if(JString::endswith($url, "/")===true) {
55
+					$slash="";
56
+		}
55 57
 		if(JString::isNotNull($attr)){
56
-			if ($attr=="value")
57
-				$retour.="url=url+'".$slash."'+$(this).val();\n";
58
-				else if($attr!=null && $attr!=="")
59
-					$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
58
+			if ($attr=="value") {
59
+							$retour.="url=url+'".$slash."'+$(this).val();\n";
60
+			} else if($attr!=null && $attr!=="") {
61
+									$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
62
+				}
60 63
 		}
61 64
 		return $retour;
62 65
 	}
@@ -78,8 +81,9 @@  discard block
 block discarded – undo
78 81
 	}
79 82
 
80 83
 	protected function _correctAjaxUrl($url) {
81
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
82
-			$url=substr($url, 0, strlen($url)-1);
84
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
85
+					$url=substr($url, 0, strlen($url)-1);
86
+		}
83 87
 		if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
84 88
 			$url=$this->jsUtils->getUrl($url);
85 89
 		}
@@ -103,8 +107,9 @@  discard block
 block discarded – undo
103 107
 				$retour.="\t".$jsCallback."\n".
104 108
 						"\t$(document).trigger('jsonReady',[data]);\n".
105 109
 						"});\n";
106
-				if ($immediatly)
107
-					$this->jquery_code_for_compile[]=$retour;
110
+				if ($immediatly) {
111
+									$this->jquery_code_for_compile[]=$retour;
112
+				}
108 113
 					return $retour;
109 114
 	}
110 115
 
@@ -143,7 +148,7 @@  discard block
 block discarded – undo
143 148
 		if($context===null){
144 149
 			$appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n";
145 150
 			$newElm = "$('#'+newId)";
146
-		}else{
151
+		} else{
147 152
 			$appendTo="\t\tnewElm.appendTo(".$context.");\n";
148 153
 			$newElm = $context.".find('#'+newId)";
149 154
 		}
@@ -153,8 +158,9 @@  discard block
 block discarded – undo
153 158
 		$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";
154 159
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
155 160
 		$retour.="\t".$jsCallback."\n"."});\n";
156
-		if ($immediatly)
157
-			$this->jquery_code_for_compile[]=$retour;
161
+		if ($immediatly) {
162
+					$this->jquery_code_for_compile[]=$retour;
163
+		}
158 164
 			return $retour;
159 165
 	}
160 166
 	/**
@@ -195,8 +201,9 @@  discard block
 block discarded – undo
195 201
 			}});\n";
196 202
 			$retour.="$('#".$form."').submit();\n";
197 203
 		}
198
-		if ($immediatly)
199
-			$this->jquery_code_for_compile[]=$retour;
204
+		if ($immediatly) {
205
+					$this->jquery_code_for_compile[]=$retour;
206
+		}
200 207
 			return $retour;
201 208
 	}
202 209
 
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryActionsTrait.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 namespace Ajax\common\traits;
4 4
 
5 5
 trait JqueryActionsTrait {
6
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
6
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
7 7
 	public abstract function _prep_element($element);
8 8
 	public abstract function _prep_value($value);
9 9
 
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
 	 * @param boolean $immediatly defers the execution if set to false
34 34
 	 * @return string
35 35
 	 */
36
-	public function after($element='this', $value='', $immediatly=false){
36
+	public function after($element='this', $value='', $immediatly=false) {
37 37
 		$element=$this->_prep_element($element);
38 38
 		$value=$this->_prep_value($value);
39 39
 		$str="$({$element}).after({$value});";
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 
59 59
 		$animations="\t\t\t";
60 60
 		if (is_array($params)) {
61
-			foreach ( $params as $param => $value ) {
61
+			foreach ($params as $param => $value) {
62 62
 				$animations.=$param.': \''.$value.'\', ';
63 63
 			}
64 64
 		}
@@ -351,8 +351,8 @@  discard block
 block discarded – undo
351 351
 	 * @param boolean $immediatly
352 352
 	 * @return string
353 353
 	 */
354
-	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
355
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
354
+	public function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
355
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
356 356
 	}
357 357
 
358 358
 	/**
@@ -378,8 +378,8 @@  discard block
 block discarded – undo
378 378
 	 * @param boolean $immediatly
379 379
 	 * @return String
380 380
 	 */
381
-	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
382
-		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
381
+	public function _execOn($element, $event, $js, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
382
+		return $this->_add_event($element, $this->_exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
383 383
 	}
384 384
 
385 385
 	/**
@@ -388,8 +388,8 @@  discard block
 block discarded – undo
388 388
 	 * @return string
389 389
 	 */
390 390
 	private function _validate_speed($speed) {
391
-		if (in_array($speed, array (
392
-				'slow','normal','fast'
391
+		if (in_array($speed, array(
392
+				'slow', 'normal', 'fast'
393 393
 		))) {
394 394
 			$speed='"'.$speed.'"';
395 395
 		} elseif (preg_match("/[^0-9]/", $speed)) {
Please login to merge, or discard this patch.
Braces   +51 added lines, -34 removed lines patch added patch discarded remove patch
@@ -19,10 +19,12 @@  discard block
 block discarded – undo
19 19
 		if (isset($value)) {
20 20
 			$value=$this->_prep_value($value);
21 21
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
22
-		} else
23
-			$str="$({$element}).attr(\"$attributeName\");";
24
-			if ($immediatly)
25
-				$this->jquery_code_for_compile[]=$str;
22
+		} else {
23
+					$str="$({$element}).attr(\"$attributeName\");";
24
+		}
25
+			if ($immediatly) {
26
+							$this->jquery_code_for_compile[]=$str;
27
+			}
26 28
 				return $str;
27 29
 	}
28 30
 
@@ -37,8 +39,9 @@  discard block
 block discarded – undo
37 39
 		$element=$this->_prep_element($element);
38 40
 		$value=$this->_prep_value($value);
39 41
 		$str="$({$element}).after({$value});";
40
-		if ($immediatly)
41
-			$this->jquery_code_for_compile[]=$str;
42
+		if ($immediatly) {
43
+					$this->jquery_code_for_compile[]=$str;
44
+		}
42 45
 			return $str;
43 46
 	}
44 47
 
@@ -74,8 +77,9 @@  discard block
 block discarded – undo
74 77
 
75 78
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
76 79
 
77
-		if ($immediatly)
78
-			$this->jquery_code_for_compile[]=$str;
80
+		if ($immediatly) {
81
+					$this->jquery_code_for_compile[]=$str;
82
+		}
79 83
 			return $str;
80 84
 	}
81 85
 
@@ -100,8 +104,9 @@  discard block
 block discarded – undo
100 104
 
101 105
 		$str="$({$element}).fadeIn({$speed}{$callback});";
102 106
 
103
-		if ($immediatly)
104
-			$this->jquery_code_for_compile[]=$str;
107
+		if ($immediatly) {
108
+					$this->jquery_code_for_compile[]=$str;
109
+		}
105 110
 			return $str;
106 111
 	}
107 112
 
@@ -126,8 +131,9 @@  discard block
 block discarded – undo
126 131
 
127 132
 		$str="$({$element}).fadeOut({$speed}{$callback});";
128 133
 
129
-		if ($immediatly)
130
-			$this->jquery_code_for_compile[]=$str;
134
+		if ($immediatly) {
135
+					$this->jquery_code_for_compile[]=$str;
136
+		}
131 137
 			return $str;
132 138
 	}
133 139
 
@@ -152,8 +158,9 @@  discard block
 block discarded – undo
152 158
 
153 159
 		$str="$({$element}).hide({$speed}{$callback});";
154 160
 
155
-		if ($immediatly)
156
-			$this->jquery_code_for_compile[]=$str;
161
+		if ($immediatly) {
162
+					$this->jquery_code_for_compile[]=$str;
163
+		}
157 164
 			return $str;
158 165
 	}
159 166
 
@@ -180,8 +187,9 @@  discard block
 block discarded – undo
180 187
 
181 188
 		$str="$({$element}).slideUp({$speed}{$callback});";
182 189
 
183
-		if ($immediatly)
184
-			$this->jquery_code_for_compile[]=$str;
190
+		if ($immediatly) {
191
+					$this->jquery_code_for_compile[]=$str;
192
+		}
185 193
 			return $str;
186 194
 	}
187 195
 
@@ -206,8 +214,9 @@  discard block
 block discarded – undo
206 214
 
207 215
 		$str="$({$element}).slideDown({$speed}{$callback});";
208 216
 
209
-		if ($immediatly)
210
-			$this->jquery_code_for_compile[]=$str;
217
+		if ($immediatly) {
218
+					$this->jquery_code_for_compile[]=$str;
219
+		}
211 220
 			return $str;
212 221
 	}
213 222
 
@@ -232,8 +241,9 @@  discard block
 block discarded – undo
232 241
 
233 242
 		$str="$({$element}).slideToggle({$speed}{$callback});";
234 243
 
235
-		if ($immediatly)
236
-			$this->jquery_code_for_compile[]=$str;
244
+		if ($immediatly) {
245
+					$this->jquery_code_for_compile[]=$str;
246
+		}
237 247
 			return $str;
238 248
 	}
239 249
 
@@ -250,8 +260,9 @@  discard block
 block discarded – undo
250 260
 		$element=$this->_prep_element($element);
251 261
 		$str="$({$element}).toggle();";
252 262
 
253
-		if ($immediatly)
254
-			$this->jquery_code_for_compile[]=$str;
263
+		if ($immediatly) {
264
+					$this->jquery_code_for_compile[]=$str;
265
+		}
255 266
 			return $str;
256 267
 	}
257 268
 
@@ -267,8 +278,9 @@  discard block
 block discarded – undo
267 278
 		$element=$this->_prep_element($element);
268 279
 		$str="$({$element}).trigger(\"$event\");";
269 280
 
270
-		if ($immediatly)
271
-			$this->jquery_code_for_compile[]=$str;
281
+		if ($immediatly) {
282
+					$this->jquery_code_for_compile[]=$str;
283
+		}
272 284
 			return $str;
273 285
 	}
274 286
 
@@ -293,8 +305,9 @@  discard block
 block discarded – undo
293 305
 
294 306
 		$str="$({$element}).show({$speed}{$callback});";
295 307
 
296
-		if ($immediatly)
297
-			$this->jquery_code_for_compile[]=$str;
308
+		if ($immediatly) {
309
+					$this->jquery_code_for_compile[]=$str;
310
+		}
298 311
 			return $str;
299 312
 	}
300 313
 
@@ -312,8 +325,9 @@  discard block
 block discarded – undo
312 325
 			$str.="else{".$jsCodeIfFalse."}";
313 326
 		}
314 327
 
315
-		if ($immediatly)
316
-			$this->jquery_code_for_compile[]=$str;
328
+		if ($immediatly) {
329
+					$this->jquery_code_for_compile[]=$str;
330
+		}
317 331
 			return $str;
318 332
 	}
319 333
 
@@ -330,11 +344,13 @@  discard block
 block discarded – undo
330 344
 	public function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
331 345
 		$param=$this->_prep_value($param);
332 346
 		$callback="";
333
-		if ($jsCallback!="")
334
-			$callback=", function(event){\n{$jsCallback}\n}";
347
+		if ($jsCallback!="") {
348
+					$callback=", function(event){\n{$jsCallback}\n}";
349
+		}
335 350
 			$script="$(".$this->_prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
336
-			if ($immediatly)
337
-				$this->jquery_code_for_compile[]=$script;
351
+			if ($immediatly) {
352
+							$this->jquery_code_for_compile[]=$script;
353
+			}
338 354
 				return $script;
339 355
 	}
340 356
 
@@ -363,8 +379,9 @@  discard block
 block discarded – undo
363 379
 	 */
364 380
 	public function _exec($js, $immediatly=false) {
365 381
 		$script=$js."\n";
366
-		if ($immediatly)
367
-			$this->jquery_code_for_compile[]=$script;
382
+		if ($immediatly) {
383
+					$this->jquery_code_for_compile[]=$script;
384
+		}
368 385
 			return $script;
369 386
 	}
370 387
 
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -17,8 +17,8 @@  discard block
 block discarded – undo
17 17
 	 * @param string $jsCallback javascript code to execute after the request
18 18
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
19 19
 	 */
20
-	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
21
-		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
20
+	public function get($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
21
+		return $this->js->_get($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
22 22
 	}
23 23
 
24 24
 	/**
@@ -29,8 +29,8 @@  discard block
 block discarded – undo
29 29
 	 * @param string $jsCallback javascript code to execute after the request
30 30
 	 * @param boolean $immediatly
31 31
 	 */
32
-	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) {
33
-		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context,$immediatly);
32
+	public function json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) {
33
+		return $this->js->_json($url, $method, $params, $jsCallback, $attr, $context, $immediatly);
34 34
 	}
35 35
 
36 36
 	/**
@@ -40,8 +40,8 @@  discard block
 block discarded – undo
40 40
 	 * @param string $url the request address
41 41
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
42 42
 	 */
43
-	public function jsonOn($event,$element, $url,$parameters=array()) {
44
-		return $this->js->_jsonOn($event, $element, $url,$parameters);
43
+	public function jsonOn($event, $element, $url, $parameters=array()) {
44
+		return $this->js->_jsonOn($event, $element, $url, $parameters);
45 45
 	}
46 46
 
47 47
 	/**
@@ -85,8 +85,8 @@  discard block
 block discarded – undo
85 85
 	 * @param string $url the request url
86 86
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
87 87
 	 */
88
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) {
89
-		return $this->js->_jsonArrayOn($event,$element,$maskSelector, $url, $parameters);
88
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) {
89
+		return $this->js->_jsonArrayOn($event, $element, $maskSelector, $url, $parameters);
90 90
 	}
91 91
 
92 92
 	/**
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
98 98
 	 * @param string $jsCallback javascript code to execute after the request
99 99
 	 * @param string $attr the html attribute added to the request
100 100
 	 */
101
-	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL,$attr="id") {
101
+	public function getDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id") {
102 102
 		return $this->js->_get($url, $params, $responseElement, $jsCallback, $attr, false);
103 103
 	}
104 104
 
@@ -136,8 +136,8 @@  discard block
 block discarded – undo
136 136
 	 * @param string $jsCallback javascript code to execute after the request
137 137
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
138 138
 	 */
139
-	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL,$hasLoader=true) {
140
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader,true);
139
+	public function post($url, $responseElement="", $params="{}", $jsCallback=NULL, $hasLoader=true) {
140
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, NULL, $hasLoader, true);
141 141
 	}
142 142
 
143 143
 	/**
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @param string $jsCallback javascript code to execute after the request
151 151
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
152 152
 	 */
153
-	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id",$hasLoader=true) {
154
-		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader,false);
153
+	public function postDeferred($url, $responseElement="", $params="{}", $jsCallback=NULL, $attr="id", $hasLoader=true) {
154
+		return $this->js->_post($url, $params, $responseElement, $jsCallback, $attr, $hasLoader, false);
155 155
 	}
156 156
 
157 157
 	/**
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
165 165
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
166 166
 	 */
167 167
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
168
-		return $this->js->_postOn($event, $element,  $url, $params, $responseElement, $parameters);
168
+		return $this->js->_postOn($event, $element, $url, $params, $responseElement, $parameters);
169 169
 	}
170 170
 
171 171
 	/**
@@ -189,8 +189,8 @@  discard block
 block discarded – undo
189 189
 	 * @param string $jsCallback javascript code to execute after the request
190 190
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
191 191
 	 */
192
-	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$hasLoader=true) {
193
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader,true);
192
+	public function postForm($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $hasLoader=true) {
193
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, NULL, $hasLoader, true);
194 194
 	}
195 195
 
196 196
 	/**
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 * @param string $attr the html attribute added to the request
204 204
 	 * @param boolean $hasLoader true for showing ajax loader. default : true
205 205
 	 */
206
-	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL,$attr="id",$hasLoader=true) {
207
-		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader,false);
206
+	public function postFormDeferred($url, $form, $responseElement, $validation=false, $jsCallback=NULL, $attr="id", $hasLoader=true) {
207
+		return $this->js->_postForm($url, $form, $responseElement, $validation, $jsCallback, $attr, $hasLoader, false);
208 208
 	}
209 209
 
210 210
 	/**
@@ -218,7 +218,7 @@  discard block
 block discarded – undo
218 218
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true)
219 219
 	 */
220 220
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
221
-		return $this->js->_postFormOn($event,$element, $url, $form, $responseElement, $parameters);
221
+		return $this->js->_postFormOn($event, $element, $url, $form, $responseElement, $parameters);
222 222
 	}
223 223
 
224 224
 	/**
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsActionsTrait.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	 * @return string
14 14
 	 */
15 15
 	public function addClass($element='this', $class='', $immediatly=false) {
16
-		return $this->js->_genericCallValue('addClass',$element, $class, $immediatly);
16
+		return $this->js->_genericCallValue('addClass', $element, $class, $immediatly);
17 17
 	}
18 18
 
19 19
 	/**
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 	 * @param boolean $immediatly defers the execution if set to false
24 24
 	 * @return string
25 25
 	 */
26
-	public function after($to, $element, $immediatly=false){
27
-		return $this->js->_genericCallElement('after',$to, $element, $immediatly);
26
+	public function after($to, $element, $immediatly=false) {
27
+		return $this->js->_genericCallElement('after', $to, $element, $immediatly);
28 28
 	}
29 29
 
30 30
 	/**
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 	 * @param boolean $immediatly defers the execution if set to false
35 35
 	 * @return string
36 36
 	 */
37
-	public function before($to, $element, $immediatly=false){
38
-		return $this->js->_genericCallElement('before',$to, $element, $immediatly);
37
+	public function before($to, $element, $immediatly=false) {
38
+		return $this->js->_genericCallElement('before', $to, $element, $immediatly);
39 39
 	}
40 40
 
41 41
 	/**
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	 * @param string $value
56 56
 	 * @param boolean $immediatly defers the execution if set to false
57 57
 	 */
58
-	public function val($element='this',$value='',$immediatly=false){
59
-		return $this->js->_genericCallValue('val',$element,$value,$immediatly);
58
+	public function val($element='this', $value='', $immediatly=false) {
59
+		return $this->js->_genericCallValue('val', $element, $value, $immediatly);
60 60
 	}
61 61
 
62 62
 	/**
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
 	 * @param boolean $immediatly defers the execution if set to false
67 67
 	 */
68 68
 	public function html($element='this', $value='', $immediatly=false) {
69
-		return $this->js->_genericCallValue('html',$element, $value, $immediatly);
69
+		return $this->js->_genericCallValue('html', $element, $value, $immediatly);
70 70
 	}
71 71
 
72 72
 	/**
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
 	 * @return string
92 92
 	 */
93 93
 	public function append($to, $element, $immediatly=false) {
94
-		return $this->js->_genericCallElement('append',$to, $element, $immediatly);
94
+		return $this->js->_genericCallElement('append', $to, $element, $immediatly);
95 95
 	}
96 96
 
97 97
 	/**
@@ -102,7 +102,7 @@  discard block
 block discarded – undo
102 102
 	 * @return string
103 103
 	 */
104 104
 	public function prepend($to, $element, $immediatly=false) {
105
-		return $this->js->_genericCallElement('prepend',$to, $element, $immediatly);
105
+		return $this->js->_genericCallElement('prepend', $to, $element, $immediatly);
106 106
 	}
107 107
 
108 108
 	/**
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 	 * @return string
154 154
 	 */
155 155
 	public function removeClass($element='this', $class='', $immediatly=false) {
156
-		return $this->js->_genericCall('removeClass',$element, $class, $immediatly);
156
+		return $this->js->_genericCall('removeClass', $element, $class, $immediatly);
157 157
 	}
158 158
 
159 159
 	/**
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
 	 * @return string
215 215
 	 */
216 216
 	public function toggleClass($element='this', $class='', $immediatly=false) {
217
-		return $this->js->_genericCallValue('toggleClass',$element, $class, $immediatly);
217
+		return $this->js->_genericCallValue('toggleClass', $element, $class, $immediatly);
218 218
 	}
219 219
 
220 220
 	/**
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 		$preventDefault=false;
291 291
 		$immediatly=true;
292 292
 		extract($parameters);
293
-		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
293
+		return $this->js->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
294 294
 	}
295 295
 
296 296
 	/**
@@ -317,7 +317,7 @@  discard block
 block discarded – undo
317 317
 		$preventDefault=false;
318 318
 		$immediatly=true;
319 319
 		extract($parameters);
320
-		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation,$immediatly);
320
+		$script=$this->js->_execOn($element, $event, $js, $preventDefault, $stopPropagation, $immediatly);
321 321
 		return $script;
322 322
 	}
323 323
 }
324 324
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/traits/JqueryEventsTrait.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,7 +4,7 @@  discard block
 block discarded – undo
4 4
 
5 5
 trait JqueryEventsTrait {
6 6
 	public abstract function _prep_element($element);
7
-	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
7
+	public abstract function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
8 8
 
9 9
 	/**
10 10
 	 * Blur
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 	 */
47 47
 	public function _click($element='this', $js=array(), $ret_false=TRUE) {
48 48
 		if (!is_array($js)) {
49
-			$js=array (
49
+			$js=array(
50 50
 					$js
51 51
 			);
52 52
 		}
Please login to merge, or discard this patch.
Ajax/common/components/SimpleComponent.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -16,16 +16,16 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct(JsUtils $js) {
18 18
 		parent::__construct($js);
19
-		$this->events=array ();
19
+		$this->events=array();
20 20
 	}
21 21
 
22 22
 	protected function compileEvents() {
23
-		foreach ( $this->events as $event => $jsCode ) {
24
-			if($event=="execute"){
23
+		foreach ($this->events as $event => $jsCode) {
24
+			if ($event=="execute") {
25 25
 				$this->jquery_code_for_compile []=$jsCode;
26
-			}else if($event=="beforeExecute"){
26
+			} else if ($event=="beforeExecute") {
27 27
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
28
-			}else
28
+			} else
29 29
 				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
30 30
 		}
31 31
 	}
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		$result=implode("\n", $this->jquery_code_for_compile);
35 35
 		$result=str_ireplace("\"%", "", $result);
36 36
 		$result=str_ireplace("%\"", "", $result);
37
-		$result=str_replace(array (
37
+		$result=str_replace(array(
38 38
 				"\\n",
39 39
 				"\\r",
40 40
 				"\\t"
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
 
45 45
 	public function getScript() {
46 46
 		$allParams=$this->params;
47
-		$this->jquery_code_for_compile=array ();
47
+		$this->jquery_code_for_compile=array();
48 48
 		$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).");";
49 49
 		$this->compileEvents();
50 50
 		return $this->compileJQueryCode();
Please login to merge, or discard this patch.
Braces   +7 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,10 +23,11 @@  discard block
 block discarded – undo
23 23
 		foreach ( $this->events as $event => $jsCode ) {
24 24
 			if($event=="execute"){
25 25
 				$this->jquery_code_for_compile []=$jsCode;
26
-			}else if($event=="beforeExecute"){
26
+			} else if($event=="beforeExecute"){
27 27
 				\array_unshift($this->jquery_code_for_compile, $jsCode);
28
-			}else
29
-				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
28
+			} else {
29
+							$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
30
+			}
30 31
 		}
31 32
 	}
32 33
 
@@ -69,8 +70,9 @@  discard block
 block discarded – undo
69 70
 
70 71
 	protected function setParamCtrl($key, $value, $typeCtrl) {
71 72
 		if (is_array($typeCtrl)) {
72
-			if (array_search($value, $typeCtrl)===false)
73
-				throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
73
+			if (array_search($value, $typeCtrl)===false) {
74
+							throw new \Exception("La valeur passée a propriété `".$key."` pour le composant `".$this->uiName."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
75
+			}
74 76
 		} else {
75 77
 			if (!$typeCtrl($value)) {
76 78
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key." au composant ".$this->uiName);
Please login to merge, or discard this patch.
Ajax/common/components/BaseComponent.php 2 patches
Braces   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -39,8 +39,9 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function getParam($key) {
41 41
 		$value=null;
42
-		if (array_key_exists($key, $this->params))
43
-			$value=$this->params [$key];
42
+		if (array_key_exists($key, $this->params)) {
43
+					$value=$this->params [$key];
44
+		}
44 45
 		return $value;
45 46
 	}
46 47
 
@@ -49,16 +50,18 @@  discard block
 block discarded – undo
49 50
 	}
50 51
 
51 52
 	public function compile(JsUtils $js=NULL) {
52
-		if ($js==NULL)
53
-			$js=$this->js;
53
+		if ($js==NULL) {
54
+					$js=$this->js;
55
+		}
54 56
 		$script=$this->getScript();
55 57
 		$js->addToCompile($script);
56 58
 	}
57 59
 
58 60
 	protected function setParamCtrl($key, $value, $typeCtrl) {
59 61
 		if (is_array($typeCtrl)) {
60
-			if (array_search($value, $typeCtrl)===false)
61
-				throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
62
+			if (array_search($value, $typeCtrl)===false) {
63
+							throw new \Exception("La valeur passée a propriété `".$key."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
64
+			}
62 65
 		} else {
63 66
 			if (!$typeCtrl($value)) {
64 67
 				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$key);
@@ -70,9 +73,9 @@  discard block
 block discarded – undo
70 73
 	public function setParams($params) {
71 74
 		foreach ( $params as $k => $v ) {
72 75
 			$method="set".ucfirst($k);
73
-			if (method_exists($this, $method))
74
-				$this->$method($v);
75
-			else {
76
+			if (method_exists($this, $method)) {
77
+							$this->$method($v);
78
+			} else {
76 79
 				$this->setParam($k, $v);
77 80
 				trigger_error("`".$k."` property n'existe pas", E_USER_NOTICE);
78 81
 			}
Please login to merge, or discard this patch.
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -10,8 +10,8 @@  discard block
 block discarded – undo
10 10
  * @version 1.001
11 11
  */
12 12
 abstract class BaseComponent {
13
-	public $jquery_code_for_compile=array ();
14
-	protected $params=array ();
13
+	public $jquery_code_for_compile=array();
14
+	protected $params=array();
15 15
 
16 16
 	/**
17 17
 	 *
@@ -68,7 +68,7 @@  discard block
 block discarded – undo
68 68
 	}
69 69
 
70 70
 	public function setParams($params) {
71
-		foreach ( $params as $k => $v ) {
71
+		foreach ($params as $k => $v) {
72 72
 			$method="set".ucfirst($k);
73 73
 			if (method_exists($this, $method))
74 74
 				$this->$method($v);
@@ -81,8 +81,8 @@  discard block
 block discarded – undo
81 81
 		return $this;
82 82
 	}
83 83
 
84
-	public function addParams($params){
85
-		foreach ($params as $k=>$v){
84
+	public function addParams($params) {
85
+		foreach ($params as $k=>$v) {
86 86
 				$this->setParam($k, $v);
87 87
 		}
88 88
 		return $this;
Please login to merge, or discard this patch.