Passed
Push — master ( 008e10...57c450 )
by Jean-Christophe
02:05
created
Ajax/semantic/html/base/HtmlSemDoubleElement.php 2 patches
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
 	use BaseTrait;
24 24
 	protected $_popup=NULL;
25 25
 	protected $_dimmer=NULL;
26
-	protected $_params=array ();
26
+	protected $_params=array();
27 27
 
28 28
 
29 29
 	public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) {
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @return HtmlDimmer
80 80
 	 */
81 81
 	public function addDimmer($params=array(), $content=NULL) {
82
-		$dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content);
82
+		$dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content);
83 83
 		$dimmer->setParams($params);
84 84
 		$dimmer->setContainer($this);
85 85
 		$this->addContent($dimmer);
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
95 95
 	 */
96 96
 	public function addLabel($label, $before=false, $icon=NULL) {
97 97
 		$labelO=$label;
98
-		if (\is_object($label) === false) {
99
-			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
98
+		if (\is_object($label)===false) {
99
+			$labelO=new HtmlLabel("label-".$this->identifier, $label);
100 100
 			if (isset($icon))
101 101
 				$labelO->addIcon($icon);
102 102
 		} else {
103
-			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
103
+			$labelO->addToPropertyCtrl("class", "label", array("label"));
104 104
 		}
105 105
 		$this->addContent($labelO, $before);
106 106
 		return $labelO;
@@ -114,9 +114,9 @@  discard block
 block discarded – undo
114 114
 	 * @param string $icon
115 115
 	 * @return HtmlSemDoubleElement
116 116
 	 */
117
-	public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){
118
-		$label=$this->addLabel($label,true,$icon);
119
-		$label->setAttached($side,$direction);
117
+	public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) {
118
+		$label=$this->addLabel($label, true, $icon);
119
+		$label->setAttached($side, $direction);
120 120
 		return $this;
121 121
 	}
122 122
 
@@ -124,10 +124,10 @@  discard block
 block discarded – undo
124 124
 	 * Transforms the element into a link
125 125
 	 * @return HtmlSemDoubleElement
126 126
 	 */
127
-	public function asLink($href=NULL,$target=NULL) {
127
+	public function asLink($href=NULL, $target=NULL) {
128 128
 		if (isset($href))
129 129
 			$this->setProperty("href", $href);
130
-		if(isset($target))
130
+		if (isset($target))
131 131
 			$this->setProperty("target", $target);
132 132
 		return $this->setTagName("a");
133 133
 	}
@@ -139,9 +139,9 @@  discard block
 block discarded – undo
139 139
 	 */
140 140
 	public function jsShowDimmer($show=true) {
141 141
 		$status="hide";
142
-		if ($show === true)
142
+		if ($show===true)
143 143
 			$status="show";
144
-		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
144
+		return '$("#.'.$this->identifier.').dimmer("'.$status.'");';
145 145
 	}
146 146
 
147 147
 	/**
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 * @see BaseHtml::compile()
150 150
 	 */
151 151
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
152
-		if (isset($this->_popup)){
152
+		if (isset($this->_popup)) {
153 153
 			$this->_popup->compile($js);
154 154
 		}
155 155
 		return parent::compile($js, $view);
@@ -160,7 +160,7 @@  discard block
 block discarded – undo
160 160
 	 * @see HtmlDoubleElement::run()
161 161
 	 */
162 162
 	public function run(JsUtils $js) {
163
-		$this->_bsComponent=$js->semantic()->generic("#" . $this->identifier);
163
+		$this->_bsComponent=$js->semantic()->generic("#".$this->identifier);
164 164
 		parent::run($js);
165 165
 		$this->addEventsOnRun($js);
166 166
 		if (isset($this->_popup)) {
@@ -169,8 +169,8 @@  discard block
 block discarded – undo
169 169
 		return $this->_bsComponent;
170 170
 	}
171 171
 
172
-	public function addList($items,$ordered=false){
173
-		$list=new HtmlList("list-".$this->identifier,$items);
172
+	public function addList($items, $ordered=false) {
173
+		$list=new HtmlList("list-".$this->identifier, $items);
174 174
 		$list->setOrdered($ordered);
175 175
 		$list->setClass("ui list");
176 176
 		$this->addContent($list);
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -41,8 +41,9 @@  discard block
 block discarded – undo
41 41
 	 * @param string $popupEvent
42 42
 	 */
43 43
 	public function setPopupAttributes($variation=NULL, $popupEvent=NULL) {
44
-		if (isset($this->_popup))
45
-			$this->_popup->setAttributes($variation, $popupEvent);
44
+		if (isset($this->_popup)) {
45
+					$this->_popup->setAttributes($variation, $popupEvent);
46
+		}
46 47
 	}
47 48
 
48 49
 	/**
@@ -97,8 +98,9 @@  discard block
 block discarded – undo
97 98
 		$labelO=$label;
98 99
 		if (\is_object($label) === false) {
99 100
 			$labelO=new HtmlLabel("label-" . $this->identifier, $label);
100
-			if (isset($icon))
101
-				$labelO->addIcon($icon);
101
+			if (isset($icon)) {
102
+							$labelO->addIcon($icon);
103
+			}
102 104
 		} else {
103 105
 			$labelO->addToPropertyCtrl("class", "label", array ("label" ));
104 106
 		}
@@ -125,10 +127,12 @@  discard block
 block discarded – undo
125 127
 	 * @return HtmlSemDoubleElement
126 128
 	 */
127 129
 	public function asLink($href=NULL,$target=NULL) {
128
-		if (isset($href))
129
-			$this->setProperty("href", $href);
130
-		if(isset($target))
131
-			$this->setProperty("target", $target);
130
+		if (isset($href)) {
131
+					$this->setProperty("href", $href);
132
+		}
133
+		if(isset($target)) {
134
+					$this->setProperty("target", $target);
135
+		}
132 136
 		return $this->setTagName("a");
133 137
 	}
134 138
 
@@ -139,8 +143,9 @@  discard block
 block discarded – undo
139 143
 	 */
140 144
 	public function jsShowDimmer($show=true) {
141 145
 		$status="hide";
142
-		if ($show === true)
143
-			$status="show";
146
+		if ($show === true) {
147
+					$status="show";
148
+		}
144 149
 		return '$("#.' . $this->identifier . ').dimmer("' . $status . '");';
145 150
 	}
146 151
 
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 2 patches
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -2,10 +2,10 @@  discard block
 block discarded – undo
2 2
 namespace Ajax\common\traits;
3 3
 use Ajax\common\BaseGui;
4 4
 
5
-trait JsUtilsInternalTrait{
5
+trait JsUtilsInternalTrait {
6 6
 
7
-	protected $jquery_code_for_compile=array ();
8
-	protected $jquery_code_for_compile_at_last=array ();
7
+	protected $jquery_code_for_compile=array();
8
+	protected $jquery_code_for_compile_at_last=array();
9 9
 
10 10
 	protected function _addToCompile($jsScript) {
11 11
 		$this->jquery_code_for_compile[]=$jsScript;
@@ -15,29 +15,29 @@  discard block
 block discarded – undo
15 15
 	 * @param BaseGui $library
16 16
 	 * @param mixed $view
17 17
 	 */
18
-	protected function _compileLibrary(BaseGui $library, &$view=NULL){
19
-		if(isset($view))
18
+	protected function _compileLibrary(BaseGui $library, &$view=NULL) {
19
+		if (isset($view))
20 20
 			$library->compileHtml($this, $view);
21 21
 		if ($library->isAutoCompile()) {
22 22
 			$library->compile(true);
23 23
 		}
24 24
 	}
25 25
 
26
-	protected function defer($script){
26
+	protected function defer($script) {
27 27
 		$result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};";
28 28
 		$result.="window.defer(function(){".$script."})";
29 29
 		return $result;
30 30
 	}
31 31
 
32
-	protected function ready($script){
32
+	protected function ready($script) {
33 33
 		$result='$(document).ready(function() {'."\n";
34 34
 		$result.=$script.'})';
35 35
 		return $result;
36 36
 	}
37 37
 
38 38
 	protected function minify($input) {
39
-		if(trim($input) === "") return $input;
40
-		$input= preg_replace(
39
+		if (trim($input)==="") return $input;
40
+		$input=preg_replace(
41 41
 				array(
42 42
 						// Remove comment(s)
43 43
 						'#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#',
Please login to merge, or discard this patch.
Braces   +6 added lines, -3 removed lines patch added patch discarded remove patch
@@ -16,8 +16,9 @@  discard block
 block discarded – undo
16 16
 	 * @param mixed $view
17 17
 	 */
18 18
 	protected function _compileLibrary(BaseGui $library, &$view=NULL){
19
-		if(isset($view))
20
-			$library->compileHtml($this, $view);
19
+		if(isset($view)) {
20
+					$library->compileHtml($this, $view);
21
+		}
21 22
 		if ($library->isAutoCompile()) {
22 23
 			$library->compile(true);
23 24
 		}
@@ -36,7 +37,9 @@  discard block
 block discarded – undo
36 37
 	}
37 38
 
38 39
 	protected function minify($input) {
39
-		if(trim($input) === "") return $input;
40
+		if(trim($input) === "") {
41
+			return $input;
42
+		}
40 43
 		$input= preg_replace(
41 44
 				array(
42 45
 						// Remove comment(s)
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsAjaxTrait.php 2 patches
Braces   +29 added lines, -22 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@  discard block
 block discarded – undo
32 32
 		$retour.="var self=this;\n";
33 33
 		if($hasLoader===true && JString::isNotNull($responseElement)){
34 34
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
35
-		}elseif($hasLoader==="internal"){
35
+		} elseif($hasLoader==="internal"){
36 36
 			$retour.="\n$(this).addClass('loading');";
37 37
 		}
38 38
 		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
@@ -49,8 +49,9 @@  discard block
 block discarded – undo
49 49
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
50 50
 		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
51 51
 		$retour=$this->_addJsCondition($jsCondition,$retour);
52
-		if ($immediatly)
53
-			$this->jquery_code_for_compile[]=$retour;
52
+		if ($immediatly) {
53
+					$this->jquery_code_for_compile[]=$retour;
54
+		}
54 55
 		return $retour;
55 56
 	}
56 57
 
@@ -86,12 +87,13 @@  discard block
 block discarded – undo
86 87
 		if(JString::isNotNull($attr)){
87 88
 			if ($attr==="value"){
88 89
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
89
-			}elseif ($attr==="html"){
90
+			} elseif ($attr==="html"){
90 91
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
91
-			}elseif(\substr($attr, 0,3)==="js:"){
92
+			} elseif(\substr($attr, 0,3)==="js:"){
92 93
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
93
-			}elseif($attr!==null && $attr!=="")
94
-				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
94
+			} elseif($attr!==null && $attr!=="") {
95
+							$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
96
+			}
95 97
 		}
96 98
 		return $retour;
97 99
 	}
@@ -111,13 +113,14 @@  discard block
 block discarded – undo
111 113
 		if (JString::isNotNull($responseElement)) {
112 114
 			if(isset($ajaxTransition)){
113 115
 				$call=$this->setAjaxDataCall($ajaxTransition);
114
-			}elseif(isset($this->ajaxTransition)){
116
+			} elseif(isset($this->ajaxTransition)){
115 117
 				$call=$this->ajaxTransition;
116 118
 			}
117
-			if(\is_callable($call))
118
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
119
-			else
120
-				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
119
+			if(\is_callable($call)) {
120
+							$retour="\t".$call($responseElement,$jqueryDone).";\n";
121
+			} else {
122
+							$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
123
+			}
121 124
 		}
122 125
 		if(isset($history)){
123 126
 			if($this->params["autoActiveLinks"]){
@@ -140,8 +143,9 @@  discard block
 block discarded – undo
140 143
 	}
141 144
 
142 145
 	protected function _correctAjaxUrl($url) {
143
-		if ($url!=="/" && JString::endsWith($url, "/")===true)
144
-			$url=substr($url, 0, strlen($url)-1);
146
+		if ($url!=="/" && JString::endsWith($url, "/")===true) {
147
+					$url=substr($url, 0, strlen($url)-1);
148
+		}
145 149
 			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
146 150
 				$url=$this->getUrl($url);
147 151
 			}
@@ -161,8 +165,9 @@  discard block
 block discarded – undo
161 165
 	public static function _implodeParams($parameters){
162 166
 		$allParameters=[];
163 167
 		foreach ($parameters as $params){
164
-			if(isset($params))
165
-				$allParameters[]=self::_correctParams($params);
168
+			if(isset($params)) {
169
+							$allParameters[]=self::_correctParams($params);
170
+			}
166 171
 		}
167 172
 		return \implode("+'&'+", $allParameters);
168 173
 	}
@@ -188,8 +193,9 @@  discard block
 block discarded – undo
188 193
 
189 194
 	protected function setDefaultParameters(&$parameters,$default){
190 195
 		foreach ($default as $k=>$v){
191
-			if(!isset($parameters[$k]))
192
-				$parameters[$k]=$v;
196
+			if(!isset($parameters[$k])) {
197
+							$parameters[$k]=$v;
198
+			}
193 199
 		}
194 200
 	}
195 201
 
@@ -307,7 +313,7 @@  discard block
 block discarded – undo
307 313
 		if($context===null){
308 314
 			$parent="$('".$maskSelector."').parent()";
309 315
 			$newElm = "$('#'+newId)";
310
-		}else{
316
+		} else{
311 317
 			$parent=$context;
312 318
 			$newElm = $context.".find('#'+newId)";
313 319
 		}
@@ -533,7 +539,7 @@  discard block
 block discarded – undo
533 539
 		$retour.="var self=this;\n";
534 540
 		if($hasLoader===true){
535 541
 			$this->addLoading($retour, $responseElement,$ajaxLoader);
536
-		}elseif($hasLoader==="internal"){
542
+		} elseif($hasLoader==="internal"){
537 543
 			$retour.="\n$(this).addClass('loading');";
538 544
 		}
539 545
 		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
@@ -551,8 +557,9 @@  discard block
 block discarded – undo
551 557
 			$retour.="$('#".$form."').submit();\n";
552 558
 		}
553 559
 		$retour=$this->_addJsCondition($jsCondition, $retour);
554
-		if ($immediatly)
555
-			$this->jquery_code_for_compile[]=$retour;
560
+		if ($immediatly) {
561
+					$this->jquery_code_for_compile[]=$retour;
562
+		}
556 563
 		return $retour;
557 564
 	}
558 565
 
Please login to merge, or discard this patch.
Spacing   +118 added lines, -118 removed lines patch added patch discarded remove patch
@@ -17,11 +17,11 @@  discard block
 block discarded – undo
17 17
 	protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>";
18 18
 
19 19
 	abstract public function getUrl($url);
20
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
21
-	abstract public function interval($jsCode,$time,$globalName=null,$immediatly=true);
20
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
21
+	abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true);
22 22
 
23
-	protected function _ajax($method,$url,$responseElement="",$parameters=[]) {
24
-		if(isset($this->params["ajax"])){
23
+	protected function _ajax($method, $url, $responseElement="", $parameters=[]) {
24
+		if (isset($this->params["ajax"])) {
25 25
 			extract($this->params["ajax"]);
26 26
 		}
27 27
 		extract($parameters);
@@ -31,109 +31,109 @@  discard block
 block discarded – undo
31 31
 		$originalSelector=$responseElement;
32 32
 		$responseElement=$this->_getResponseElement($responseElement);
33 33
 		$retour.="var self=this;\n";
34
-		if($hasLoader===true && JString::isNotNull($responseElement)){
35
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
36
-		}elseif($hasLoader==="internal"){
34
+		if ($hasLoader===true && JString::isNotNull($responseElement)) {
35
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
36
+		}elseif ($hasLoader==="internal") {
37 37
 			$retour.="\n$(this).addClass('loading');";
38 38
 		}
39
-		$ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"];
39
+		$ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"];
40 40
 		
41
-		$ajaxParameters["async"]=($async?"true":"false");
41
+		$ajaxParameters["async"]=($async ? "true" : "false");
42 42
 		
43
-		if(isset($params)){
43
+		if (isset($params)) {
44 44
 			$ajaxParameters["data"]=self::_correctParams($params);
45 45
 		}
46
-		if(isset($headers)){
46
+		if (isset($headers)) {
47 47
 			$ajaxParameters["headers"]=$headers;
48 48
 		}
49 49
 		$this->createAjaxParameters($ajaxParameters, $parameters);
50 50
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n";
51
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n";
52
-		$retour=$this->_addJsCondition($jsCondition,$retour);
51
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n";
52
+		$retour=$this->_addJsCondition($jsCondition, $retour);
53 53
 		if ($immediatly)
54 54
 			$this->jquery_code_for_compile[]=$retour;
55 55
 		return $retour;
56 56
 	}
57 57
 
58
-	protected function createAjaxParameters(&$original,$parameters){
59
-		$validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"];
60
-		foreach ($validParameters as $param=>$mask){
61
-			if(isset($parameters[$param])){
58
+	protected function createAjaxParameters(&$original, $parameters) {
59
+		$validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"];
60
+		foreach ($validParameters as $param=>$mask) {
61
+			if (isset($parameters[$param])) {
62 62
 				$original[$param]=\str_replace("%value%", $parameters[$param], $mask);
63 63
 			}
64 64
 		}
65 65
 	}
66 66
 
67
-	protected function implodeAjaxParameters($ajaxParameters){
68
-		$s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; }
67
+	protected function implodeAjaxParameters($ajaxParameters) {
68
+		$s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; }
69 69
 		return $s;
70 70
 	}
71 71
 
72
-	protected function _addJsCondition($jsCondition,$jsSource){
73
-		if(isset($jsCondition)){
72
+	protected function _addJsCondition($jsCondition, $jsSource) {
73
+		if (isset($jsCondition)) {
74 74
 			return "if(".$jsCondition."){\n".$jsSource."\n}";
75 75
 		}
76 76
 		return $jsSource;
77 77
 	}
78 78
 
79 79
 
80
-	protected function _getAjaxUrl($url,$attr){
80
+	protected function _getAjaxUrl($url, $attr) {
81 81
 		$url=$this->_correctAjaxUrl($url);
82 82
 		$retour="url='".$url."';";
83 83
 		$slash="/";
84
-		if(JString::endswith($url, "/")===true){
84
+		if (JString::endswith($url, "/")===true) {
85 85
 			$slash="";
86 86
 		}
87
-		if(JString::isNotNull($attr)){
88
-			if ($attr==="value"){
87
+		if (JString::isNotNull($attr)) {
88
+			if ($attr==="value") {
89 89
 				$retour.="url=url+'".$slash."'+$(this).val();\n";
90
-			}elseif ($attr==="html"){
90
+			}elseif ($attr==="html") {
91 91
 				$retour.="url=url+'".$slash."'+$(this).html();\n";
92
-			}elseif(\substr($attr, 0,3)==="js:"){
92
+			}elseif (\substr($attr, 0, 3)==="js:") {
93 93
 				$retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n";
94
-			}elseif($attr!==null && $attr!=="")
94
+			}elseif ($attr!==null && $attr!=="")
95 95
 				$retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n";
96 96
 		}
97 97
 		return $retour;
98 98
 	}
99 99
 	
100
-	protected function onPopstate(){
100
+	protected function onPopstate() {
101 101
 		return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};";
102 102
 	}
103 103
 	
104
-	protected function autoActiveLinks($previousURL="window.location.href"){
105
-		$result= "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
104
+	protected function autoActiveLinks($previousURL="window.location.href") {
105
+		$result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}";
106 106
 		$result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;";
107 107
 		return $result;
108 108
 	}
109 109
 
110
-	protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback,$hasLoader=false,$history=null){
111
-		$retour="";$call=null;
110
+	protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) {
111
+		$retour=""; $call=null;
112 112
 		if (JString::isNotNull($responseElement)) {
113
-			if(isset($ajaxTransition)){
113
+			if (isset($ajaxTransition)) {
114 114
 				$call=$this->setAjaxDataCall($ajaxTransition);
115
-			}elseif(isset($this->ajaxTransition)){
115
+			}elseif (isset($this->ajaxTransition)) {
116 116
 				$call=$this->ajaxTransition;
117 117
 			}
118
-			if(\is_callable($call))
119
-				$retour="\t".$call($responseElement,$jqueryDone).";\n";
118
+			if (\is_callable($call))
119
+				$retour="\t".$call($responseElement, $jqueryDone).";\n";
120 120
 			else
121 121
 				$retour="\t{$responseElement}.{$jqueryDone}( data );\n";
122 122
 		}
123
-		if(isset($history)){
124
-			if($this->params["autoActiveLinks"]){
123
+		if (isset($history)) {
124
+			if ($this->params["autoActiveLinks"]) {
125 125
 				$retour.=$this->autoActiveLinks("url");
126 126
 			}
127 127
 			$retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);";
128 128
 		}
129
-		if($hasLoader==="internal"){
129
+		if ($hasLoader==="internal") {
130 130
 			$retour.="\n$(self).removeClass('loading');";
131 131
 		}
132 132
 		$retour.="\t".$jsCallback."\n";
133 133
 		return $retour;
134 134
 	}
135 135
 
136
-	protected function _getResponseElement($responseElement){
136
+	protected function _getResponseElement($responseElement) {
137 137
 		if (JString::isNotNull($responseElement)) {
138 138
 			$responseElement=Javascript::prep_jquery_selector($responseElement);
139 139
 		}
@@ -143,33 +143,33 @@  discard block
 block discarded – undo
143 143
 	protected function _correctAjaxUrl($url) {
144 144
 		if ($url!=="/" && JString::endsWith($url, "/")===true)
145 145
 			$url=substr($url, 0, strlen($url)-1);
146
-			if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) {
146
+			if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) {
147 147
 				$url=$this->getUrl($url);
148 148
 			}
149 149
 			return $url;
150 150
 	}
151 151
 
152
-	public static function _correctParams($params){
153
-		if(JString::isNull($params)){
152
+	public static function _correctParams($params) {
153
+		if (JString::isNull($params)) {
154 154
 			return "";
155 155
 		}
156
-		if(\preg_match("@^\{.*?\}$@", $params)){
156
+		if (\preg_match("@^\{.*?\}$@", $params)) {
157 157
 			return '$.param('.$params.')';
158 158
 		}
159 159
 		return $params;
160 160
 	}
161 161
 
162
-	public static function _implodeParams($parameters){
162
+	public static function _implodeParams($parameters) {
163 163
 		$allParameters=[];
164
-		foreach ($parameters as $params){
165
-			if(isset($params))
164
+		foreach ($parameters as $params) {
165
+			if (isset($params))
166 166
 				$allParameters[]=self::_correctParams($params);
167 167
 		}
168 168
 		return \implode("+'&'+", $allParameters);
169 169
 	}
170 170
 
171
-	protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) {
172
-		if(!isset($ajaxLoader)){
171
+	protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) {
172
+		if (!isset($ajaxLoader)) {
173 173
 			$ajaxLoader=$this->ajaxLoader;
174 174
 		}
175 175
 		$loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>';
@@ -177,19 +177,19 @@  discard block
 block discarded – undo
177 177
 		$retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n";
178 178
 	}
179 179
 
180
-	protected function setAjaxDataCall($params){
180
+	protected function setAjaxDataCall($params) {
181 181
 		$result=null;
182
-		if(!\is_callable($params)){
183
-			$result=function ($responseElement,$jqueryDone="html") use($params){
184
-				return AjaxTransition::{$params}($responseElement,$jqueryDone);
182
+		if (!\is_callable($params)) {
183
+			$result=function($responseElement, $jqueryDone="html") use($params){
184
+				return AjaxTransition::{$params}($responseElement, $jqueryDone);
185 185
 			};
186 186
 		}
187 187
 		return $result;
188 188
 	}
189 189
 
190
-	protected function setDefaultParameters(&$parameters,$default){
191
-		foreach ($default as $k=>$v){
192
-			if(!isset($parameters[$k]))
190
+	protected function setDefaultParameters(&$parameters, $default) {
191
+		foreach ($default as $k=>$v) {
192
+			if (!isset($parameters[$k]))
193 193
 				$parameters[$k]=$v;
194 194
 		}
195 195
 	}
@@ -203,8 +203,8 @@  discard block
 block discarded – undo
203 203
 	 * @param string $url The url of the request
204 204
 	 * @param string $responseElement selector of the HTML element displaying the answer
205 205
 	 */
206
-	private function _get($url, $responseElement="",$parameters=[]) {
207
-		return $this->_ajax("get", $url,$responseElement,$parameters);
206
+	private function _get($url, $responseElement="", $parameters=[]) {
207
+		return $this->_ajax("get", $url, $responseElement, $parameters);
208 208
 	}
209 209
 
210 210
 	/**
@@ -213,9 +213,9 @@  discard block
 block discarded – undo
213 213
 	 * @param string $responseElement selector of the HTML element displaying the answer
214 214
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
215 215
 	 */
216
-	public function get($url, $responseElement="",$parameters=[]) {
216
+	public function get($url, $responseElement="", $parameters=[]) {
217 217
 		$parameters["immediatly"]=true;
218
-		return $this->_get($url,$responseElement,$parameters);
218
+		return $this->_get($url, $responseElement, $parameters);
219 219
 	}
220 220
 
221 221
 	/**
@@ -225,13 +225,13 @@  discard block
 block discarded – undo
225 225
 	 * @param string $responseElement selector of the HTML element displaying the answer
226 226
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
227 227
 	 */
228
-	public function ajax($method,$url, $responseElement="", $parameters=[]) {
228
+	public function ajax($method, $url, $responseElement="", $parameters=[]) {
229 229
 		$parameters["immediatly"]=true;
230
-		return $this->_ajax($method,$url,$responseElement,$parameters);
230
+		return $this->_ajax($method, $url, $responseElement, $parameters);
231 231
 	}
232 232
 	
233
-	public function ajaxInterval($method,$url, $interval,$globalName=null,$responseElement="", $parameters=[]){
234
-		return $this->interval($this->ajaxDeferred($method, $url,$responseElement,$parameters), $interval,$globalName);
233
+	public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) {
234
+		return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName);
235 235
 	}
236 236
 
237 237
 	/**
@@ -241,9 +241,9 @@  discard block
 block discarded – undo
241 241
 	 * @param string $responseElement selector of the HTML element displaying the answer
242 242
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
243 243
 	 */
244
-	public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) {
244
+	public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) {
245 245
 		$parameters["immediatly"]=false;
246
-		return $this->_ajax($method,$url,$responseElement,$parameters);
246
+		return $this->_ajax($method, $url, $responseElement, $parameters);
247 247
 	}
248 248
 
249 249
 	/**
@@ -252,8 +252,8 @@  discard block
 block discarded – undo
252 252
 	 * @param string $method Method used
253 253
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
254 254
 	 */
255
-	private function _json($url, $method="get",$parameters=[]) {
256
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
255
+	private function _json($url, $method="get", $parameters=[]) {
256
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
257 257
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
258 258
 		$context=isset($parameters['context']) ? $parameters['context'] : "document";
259 259
 		$retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"
@@ -261,7 +261,7 @@  discard block
 block discarded – undo
261 261
 				."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n";
262 262
 				$retour.="\t$(document).trigger('jsonReady',[data]);\n";
263 263
 		$parameters["jsCallback"]=$retour;
264
-		return $this->_ajax($method, $url,null,$parameters);
264
+		return $this->_ajax($method, $url, null, $parameters);
265 265
 	}
266 266
 	
267 267
 	/**
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false)
272 272
 	 */
273 273
 	public function json($url, $method="get", $parameters=[]) {
274
-		return $this->_json($url,$method,$parameters);
274
+		return $this->_json($url, $method, $parameters);
275 275
 	}
276 276
 
277 277
 	/**
@@ -282,9 +282,9 @@  discard block
 block discarded – undo
282 282
 	 * @param string $method default get
283 283
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true)
284 284
 	 */
285
-	public function jsonOn($event,$element, $url,$method="get",$parameters=array()) {
286
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
287
-		return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
285
+	public function jsonOn($event, $element, $url, $method="get", $parameters=array()) {
286
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
287
+		return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
288 288
 	}
289 289
 
290 290
 	/**
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 	 */
296 296
 	public function jsonDeferred($url, $method="get", $parameters=[]) {
297 297
 		$parameters["immediatly"]=false;
298
-		return $this->_json($url,$method,$parameters);
298
+		return $this->_json($url, $method, $parameters);
299 299
 	}
300 300
 
301 301
 	/**
@@ -306,27 +306,27 @@  discard block
 block discarded – undo
306 306
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
307 307
 	 */
308 308
 	private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
309
-		$parameters=\array_merge($parameters,["hasLoader"=>false]);
309
+		$parameters=\array_merge($parameters, ["hasLoader"=>false]);
310 310
 		$rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json";
311 311
 		$jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : "";
312 312
 		$context=isset($parameters['context']) ? $parameters['context'] : null;
313
-		if($context===null){
313
+		if ($context===null) {
314 314
 			$parent="$('".$maskSelector."').parent()";
315
-			$newElm = "$('#'+newId)";
316
-		}else{
315
+			$newElm="$('#'+newId)";
316
+		} else {
317 317
 			$parent=$context;
318
-			$newElm = $context.".find('#'+newId)";
318
+			$newElm=$context.".find('#'+newId)";
319 319
 		}
320 320
 		$appendTo="\t\tnewElm.appendTo(".$parent.");\n";
321 321
 		$retour=$parent.".find('.{$rowClass}').remove();";
322 322
 		$retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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();
323 323
 		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";
324
-		$retour.= $appendTo;
324
+		$retour.=$appendTo;
325 325
 		$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";
326 326
 		$retour.="\t$(document).trigger('jsonReady',[data]);\n";
327 327
 		$retour.="\t".$jsCallback;
328 328
 		$parameters["jsCallback"]=$retour;
329
-		return $this->_ajax($method, $url,null,$parameters);
329
+		return $this->_ajax($method, $url, null, $parameters);
330 330
 	}
331 331
 
332 332
 	/**
@@ -337,7 +337,7 @@  discard block
 block discarded – undo
337 337
 	 * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json")
338 338
 	 */
339 339
 	public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) {
340
-		return $this->_jsonArray($maskSelector, $url,$method,$parameters);
340
+		return $this->_jsonArray($maskSelector, $url, $method, $parameters);
341 341
 	}
342 342
 
343 343
 	/**
@@ -360,9 +360,9 @@  discard block
 block discarded – undo
360 360
 	 * @param string $method Method used, default : get
361 361
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true)
362 362
 	 */
363
-	public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) {
364
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
365
-		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
363
+	public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) {
364
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
365
+		return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
366 366
 	}
367 367
 
368 368
 	/**
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 	 */
375 375
 	public function getDeferred($url, $responseElement="", $parameters=[]) {
376 376
 		$parameters["immediatly"]=false;
377
-		return $this->_get($url, $responseElement,$parameters);
377
+		return $this->_get($url, $responseElement, $parameters);
378 378
 	}
379 379
 
380 380
 	/**
@@ -387,8 +387,8 @@  discard block
 block discarded – undo
387 387
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
388 388
 	 */
389 389
 	public function getOn($event, $element, $url, $responseElement="", $parameters=array()) {
390
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
391
-		return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
390
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
391
+		return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
392 392
 	}
393 393
 
394 394
 	/**
@@ -401,8 +401,8 @@  discard block
 block discarded – undo
401 401
 	 * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
402 402
 	 */
403 403
 	public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) {
404
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]);
405
-		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
404
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]);
405
+		return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
406 406
 	}
407 407
 
408 408
 	/**
@@ -436,15 +436,15 @@  discard block
 block discarded – undo
436 436
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true)
437 437
 	 * @return $this
438 438
 	 */
439
-	public function getHref($element,$responseElement="",$parameters=array()){
439
+	public function getHref($element, $responseElement="", $parameters=array()) {
440 440
 		$parameters["attr"]="href";
441
-		if(JString::isNull($responseElement)){
441
+		if (JString::isNull($responseElement)) {
442 442
 			$responseElement='%$(self).attr("data-target")%';
443 443
 		}
444
-		if(!isset($parameters["historize"])){
444
+		if (!isset($parameters["historize"])) {
445 445
 			$parameters["historize"]=true;
446 446
 		}
447
-		return $this->getOnClick($element, "",$responseElement,$parameters);
447
+		return $this->getOnClick($element, "", $responseElement, $parameters);
448 448
 	}
449 449
 	
450 450
 	/**
@@ -454,20 +454,20 @@  discard block
 block discarded – undo
454 454
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false)
455 455
 	 * @return $this
456 456
 	 */
457
-	public function postHref($element,$responseElement="",$parameters=array()){
457
+	public function postHref($element, $responseElement="", $parameters=array()) {
458 458
 		$parameters["attr"]="href";
459
-		if(JString::isNull($responseElement)){
459
+		if (JString::isNull($responseElement)) {
460 460
 			$responseElement='%$(this).attr("data-target")%';
461 461
 		}
462
-		if(!isset($parameters["historize"])){
462
+		if (!isset($parameters["historize"])) {
463 463
 			$parameters["historize"]=true;
464 464
 		}
465
-		return $this->postOnClick($element, "","{}",$responseElement,$parameters);
465
+		return $this->postOnClick($element, "", "{}", $responseElement, $parameters);
466 466
 	}
467 467
 
468
-	private function _post($url, $params="{}",$responseElement="", $parameters=[]) {
468
+	private function _post($url, $params="{}", $responseElement="", $parameters=[]) {
469 469
 		$parameters["params"]=$params;
470
-		return $this->_ajax("POST", $url,$responseElement,$parameters);
470
+		return $this->_ajax("POST", $url, $responseElement, $parameters);
471 471
 	}
472 472
 
473 473
 	/**
@@ -477,8 +477,8 @@  discard block
 block discarded – undo
477 477
 	 * @param string $params JSON parameters
478 478
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
479 479
 	 */
480
-	public function post($url, $params="{}",$responseElement="", $parameters=[]) {
481
-		return $this->_post($url, $params,$responseElement, $parameters);
480
+	public function post($url, $params="{}", $responseElement="", $parameters=[]) {
481
+		return $this->_post($url, $params, $responseElement, $parameters);
482 482
 	}
483 483
 
484 484
 	/**
@@ -489,7 +489,7 @@  discard block
 block discarded – undo
489 489
 	 * @param string $responseElement selector of the HTML element displaying the answer
490 490
 	 * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
491 491
 	 */
492
-	public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) {
492
+	public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) {
493 493
 		$parameters["immediatly"]=false;
494 494
 		return $this->_post($url, $params, $responseElement, $parameters);
495 495
 	}
@@ -505,8 +505,8 @@  discard block
 block discarded – undo
505 505
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false)
506 506
 	 */
507 507
 	public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) {
508
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
509
-		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
508
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
509
+		return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
510 510
 	}
511 511
 
512 512
 	/**
@@ -523,33 +523,33 @@  discard block
 block discarded – undo
523 523
 	}
524 524
 
525 525
 	private function _postForm($url, $form, $responseElement, $parameters=[]) {
526
-		if(isset($this->params["ajax"])){
526
+		if (isset($this->params["ajax"])) {
527 527
 			extract($this->params["ajax"]);
528 528
 		}
529
-		$params="{}";$validation=false;
529
+		$params="{}"; $validation=false;
530 530
 		\extract($parameters);
531
-		$async=($async)?"true":"false";
531
+		$async=($async) ? "true" : "false";
532 532
 		$jsCallback=isset($jsCallback) ? $jsCallback : "";
533 533
 		$retour=$this->_getAjaxUrl($url, $attr);
534 534
 		$retour.="\n$('#".$form."').trigger('ajaxSubmit');";
535 535
 		$retour.="\nvar params=$('#".$form."').serialize();\n";
536
-		if(isset($params)){
536
+		if (isset($params)) {
537 537
 			$retour.="params+='&'+".self::_correctParams($params).";\n";
538 538
 		}
539 539
 		$responseElement=$this->_getResponseElement($responseElement);
540 540
 		$retour.="var self=this;\n";
541
-		if($hasLoader===true){
542
-			$this->addLoading($retour, $responseElement,$ajaxLoader);
543
-		}elseif($hasLoader==="internal"){
541
+		if ($hasLoader===true) {
542
+			$this->addLoading($retour, $responseElement, $ajaxLoader);
543
+		}elseif ($hasLoader==="internal") {
544 544
 			$retour.="\n$(this).addClass('loading');";
545 545
 		}
546
-		$ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async];
547
-		if(isset($headers)){
546
+		$ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async];
547
+		if (isset($headers)) {
548 548
 			$ajaxParameters["headers"]=$headers;
549 549
 		}
550 550
 		$this->createAjaxParameters($ajaxParameters, $parameters);
551 551
 		$retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n";
552
-		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader)."});\n";
552
+		$retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n";
553 553
 
554 554
 		if ($validation) {
555 555
 			$retour="$('#".$form."').validate({submitHandler: function(form) {
@@ -599,8 +599,8 @@  discard block
 block discarded – undo
599 599
 	 * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false)
600 600
 	 */
601 601
 	public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) {
602
-		$this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]);
603
-		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]);
602
+		$this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]);
603
+		return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]);
604 604
 	}
605 605
 
606 606
 	/**
Please login to merge, or discard this patch.
Ajax/semantic/components/Visibility.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -10,12 +10,12 @@
 block discarded – undo
10 10
  * @author jc
11 11
  *
12 12
  */
13
-class Visibility extends SimpleSemExtComponent{
13
+class Visibility extends SimpleSemExtComponent {
14 14
 	
15 15
 	public function __construct(JsUtils $js) {
16 16
 		parent::__construct($js);
17 17
 		$this->uiName="visibility";
18
-		$this->params=["once"=>false,"observeChanges"=>true];
18
+		$this->params=["once"=>false, "observeChanges"=>true];
19 19
 	}
20 20
 	
21 21
 	public function setOnce($value=false) {
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/html5/HtmlDatalist.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -5,20 +5,20 @@
 block discarded – undo
5 5
 use Ajax\common\html\HtmlDoubleElement;
6 6
 use Ajax\common\html\HtmlCollection;
7 7
 
8
-class HtmlDatalist extends HtmlCollection{
8
+class HtmlDatalist extends HtmlCollection {
9 9
 	
10
-	public function __construct($identifier){
11
-		parent::__construct($identifier,"datalist");
10
+	public function __construct($identifier) {
11
+		parent::__construct($identifier, "datalist");
12 12
 	}
13 13
 	
14 14
 	protected function createItem($value) {
15
-		$elm= new HtmlDoubleElement("","option");
15
+		$elm=new HtmlDoubleElement("", "option");
16 16
 		$elm->setProperty("value", $value->getContent());
17 17
 		$elm->setContent($value);
18 18
 		return $elm;
19 19
 	}
20 20
 	
21
-	protected function createCondition($value){
21
+	protected function createCondition($value) {
22 22
 		return true;
23 23
 	}
24 24
 }
Please login to merge, or discard this patch.
Ajax/common/html/BaseHtml.php 2 patches
Braces   +15 added lines, -11 removed lines patch added patch discarded remove patch
@@ -109,15 +109,18 @@  discard block
 block discarded – undo
109 109
 			$flag=false;
110 110
 			$index=0;
111 111
 			while ( !$flag && $index < sizeof($elements) ) {
112
-				if ($elements[$index] instanceof BaseHtml)
113
-					$flag=($callback($elements[$index]));
112
+				if ($elements[$index] instanceof BaseHtml) {
113
+									$flag=($callback($elements[$index]));
114
+				}
114 115
 					$index++;
115 116
 			}
116
-			if ($flag === true)
117
-				return $elements[$index - 1];
117
+			if ($flag === true) {
118
+							return $elements[$index - 1];
119
+			}
118 120
 		} elseif ($elements instanceof BaseHtml) {
119
-			if ($callback($elements))
120
-				return $elements;
121
+			if ($callback($elements)) {
122
+							return $elements;
123
+			}
121 124
 		}
122 125
 		return null;
123 126
 	}
@@ -143,8 +146,9 @@  discard block
 block discarded – undo
143 146
 
144 147
 	public function fromArray($array) {
145 148
 		foreach ( $this as $key => $value ) {
146
-			if(array_key_exists($key, $array)===true)
147
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
149
+			if(array_key_exists($key, $array)===true) {
150
+							$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
151
+			}
148 152
 		}
149 153
 		foreach ( $array as $key => $value ) {
150 154
 			if($this->_callSetter($key, $key, $value, $array)===false){
@@ -213,11 +217,11 @@  discard block
 block discarded – undo
213 217
 				if(\strstr($result, "%{$key}%")!==false){
214 218
 					if (\is_array($value)) {
215 219
 						$v=PropertyWrapper::wrap($value, $js,$view);
216
-					}elseif($value instanceof \stdClass){
220
+					} elseif($value instanceof \stdClass){
217 221
 							$v=\print_r($value,true);
218
-					}elseif ($value instanceof BaseHtml){
222
+					} elseif ($value instanceof BaseHtml){
219 223
 						$v=$value->compile($js,$view);
220
-					}else{
224
+					} else{
221 225
 						$v=$value;
222 226
 					}
223 227
 					$result=str_replace("%{$key}%", $v, $result);
Please login to merge, or discard this patch.
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -15,11 +15,11 @@  discard block
 block discarded – undo
15 15
  * @version 1.3
16 16
  */
17 17
 abstract class BaseHtml extends BaseWidget {
18
-	use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait;
18
+	use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait;
19 19
 	protected $_template;
20 20
 	protected $tagName;
21
-	protected $_wrapBefore=array ();
22
-	protected $_wrapAfter=array ();
21
+	protected $_wrapBefore=array();
22
+	protected $_wrapAfter=array();
23 23
 	protected $_bsComponent;
24 24
 	protected $_compiled=false;
25 25
 	protected $_runned=false;
@@ -33,32 +33,32 @@  discard block
 block discarded – undo
33 33
 	 */
34 34
 	abstract public function run(JsUtils $js);
35 35
 
36
-	private function _callSetter($setter,$key,$value,&$array){
36
+	private function _callSetter($setter, $key, $value, &$array) {
37 37
 		$result=false;
38
-		if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") {
38
+		if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") {
39 39
 			try {
40 40
 				$this->$setter($value);
41 41
 				unset($array[$key]);
42 42
 				$result=true;
43
-			} catch ( \Exception $e ) {
43
+			}catch (\Exception $e) {
44 44
 				$result=false;
45 45
 			}
46 46
 		}
47 47
 		return $result;
48 48
 	}
49 49
 
50
-	protected function getTemplate(JsUtils $js=NULL,$view=null) {
51
-		return PropertyWrapper::wrap($this->_wrapBefore, $js,$view) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js,$view);
50
+	protected function getTemplate(JsUtils $js=NULL, $view=null) {
51
+		return PropertyWrapper::wrap($this->_wrapBefore, $js, $view).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js, $view);
52 52
 	}
53 53
 
54 54
 	protected function ctrl($name, $value, $typeCtrl) {
55 55
 		if (\is_array($typeCtrl)) {
56
-			if (array_search($value, $typeCtrl) === false) {
57
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
56
+			if (array_search($value, $typeCtrl)===false) {
57
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
58 58
 			}
59 59
 		} else {
60 60
 			if (!$typeCtrl($value)) {
61
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
61
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
62 62
 			}
63 63
 		}
64 64
 		return true;
@@ -75,7 +75,7 @@  discard block
 block discarded – undo
75 75
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
76 76
 		if (\is_array($typeCtrl)) {
77 77
 			$this->removeOldValues($name, $typeCtrl);
78
-			$name.=$separator . $value;
78
+			$name.=$separator.$value;
79 79
 		}
80 80
 		return $this;
81 81
 	}
@@ -87,12 +87,12 @@  discard block
 block discarded – undo
87 87
 		if (\is_array($typeCtrl)) {
88 88
 			$this->removeOldValues($name, $typeCtrl);
89 89
 		}
90
-		$name.=$separator . $value;
90
+		$name.=$separator.$value;
91 91
 		return $this;
92 92
 	}
93 93
 
94 94
 	protected function addToMember(&$name, $value, $separator=" ") {
95
-		$name=str_ireplace($value, "", $name) . $separator . $value;
95
+		$name=str_ireplace($value, "", $name).$separator.$value;
96 96
 		return $this;
97 97
 	}
98 98
 
@@ -103,18 +103,18 @@  discard block
 block discarded – undo
103 103
 		$oldValue=trim($oldValue);
104 104
 	}
105 105
 
106
-	protected function _getElementBy($callback,$elements){
106
+	protected function _getElementBy($callback, $elements) {
107 107
 		if (\is_array($elements)) {
108 108
 			$elements=\array_values($elements);
109 109
 			$flag=false;
110 110
 			$index=0;
111
-			while ( !$flag && $index < sizeof($elements) ) {
111
+			while (!$flag && $index<sizeof($elements)) {
112 112
 				if ($elements[$index] instanceof BaseHtml)
113 113
 					$flag=($callback($elements[$index]));
114 114
 					$index++;
115 115
 			}
116
-			if ($flag === true)
117
-				return $elements[$index - 1];
116
+			if ($flag===true)
117
+				return $elements[$index-1];
118 118
 		} elseif ($elements instanceof BaseHtml) {
119 119
 			if ($callback($elements))
120 120
 				return $elements;
@@ -142,13 +142,13 @@  discard block
 block discarded – undo
142 142
 	}
143 143
 
144 144
 	public function fromArray($array) {
145
-		foreach ( $this as $key => $value ) {
146
-			if(array_key_exists($key, $array)===true)
147
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
145
+		foreach ($this as $key => $value) {
146
+			if (array_key_exists($key, $array)===true)
147
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
148 148
 		}
149
-		foreach ( $array as $key => $value ) {
150
-			if($this->_callSetter($key, $key, $value, $array)===false){
151
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
149
+		foreach ($array as $key => $value) {
150
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
151
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
152 152
 			}
153 153
 		}
154 154
 		return $array;
@@ -156,7 +156,7 @@  discard block
 block discarded – undo
156 156
 
157 157
 	public function fromDatabaseObjects($objects, $function) {
158 158
 		if (isset($objects)) {
159
-			foreach ( $objects as $object ) {
159
+			foreach ($objects as $object) {
160 160
 				$this->fromDatabaseObject($object, $function);
161 161
 			}
162 162
 		}
@@ -177,7 +177,7 @@  discard block
 block discarded – undo
177 177
 
178 178
 
179 179
 	public function getElementById($identifier, $elements) {
180
-		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
180
+		return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
181 181
 	}
182 182
 
183 183
 	public function getBsComponent() {
@@ -190,11 +190,11 @@  discard block
 block discarded – undo
190 190
 	}
191 191
 
192 192
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
193
-		if(!$this->_compiled){
194
-			if(isset($js)){
193
+		if (!$this->_compiled) {
194
+			if (isset($js)) {
195 195
 				$beforeCompile=$js->getParam("beforeCompileHtml");
196
-				if(\is_callable($beforeCompile)){
197
-					$beforeCompile($this,$js,$view);
196
+				if (\is_callable($beforeCompile)) {
197
+					$beforeCompile($this, $js, $view);
198 198
 				}
199 199
 			}
200 200
 			$this->callCallback($this->_preCompile);
@@ -204,17 +204,17 @@  discard block
 block discarded – undo
204 204
 	}
205 205
 
206 206
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
207
-		$this->compile_once($js,$view);
208
-		$result=$this->getTemplate($js,$view);
209
-		foreach ( $this as $key => $value ) {
210
-				if(\strstr($result, "%{$key}%")!==false){
207
+		$this->compile_once($js, $view);
208
+		$result=$this->getTemplate($js, $view);
209
+		foreach ($this as $key => $value) {
210
+				if (\strstr($result, "%{$key}%")!==false) {
211 211
 					if (\is_array($value)) {
212
-						$v=PropertyWrapper::wrap($value, $js,$view);
213
-					}elseif($value instanceof \stdClass){
214
-							$v=\print_r($value,true);
215
-					}elseif ($value instanceof BaseHtml){
216
-						$v=$value->compile($js,$view);
217
-					}else{
212
+						$v=PropertyWrapper::wrap($value, $js, $view);
213
+					}elseif ($value instanceof \stdClass) {
214
+							$v=\print_r($value, true);
215
+					}elseif ($value instanceof BaseHtml) {
216
+						$v=$value->compile($js, $view);
217
+					} else {
218 218
 						$v=$value;
219 219
 					}
220 220
 					$result=str_replace("%{$key}%", $v, $result);
@@ -222,12 +222,12 @@  discard block
 block discarded – undo
222 222
 		}
223 223
 		if (isset($js)===true) {
224 224
 			$this->run($js);
225
-			if (isset($view) === true) {
225
+			if (isset($view)===true) {
226 226
 				$js->addViewElement($this->_identifier, $result, $view);
227 227
 			}
228 228
 		}
229 229
 
230
-		if(\is_callable($this->_postCompile)){
230
+		if (\is_callable($this->_postCompile)) {
231 231
 			$pc=$this->_postCompile;
232 232
 			$pc($this);
233 233
 		}
@@ -241,13 +241,13 @@  discard block
 block discarded – undo
241 241
 	 * @param array $parameters default: ["jsCallback"=>"","jqueryDone"=>"append"]
242 242
 	 * @return \Ajax\common\html\BaseHtml
243 243
 	 */
244
-	public function setDraggable($attr="id",$dropZone=null,$parameters=[]){
244
+	public function setDraggable($attr="id", $dropZone=null, $parameters=[]) {
245 245
 		$this->setProperty("draggable", "true");
246
-		$this->addEvent("dragstart",Javascript::draggable($attr));
247
-		if(isset($dropZone)&& $dropZone instanceof BaseHtml){
248
-			$jqueryDone="append";$jsCallback="";
246
+		$this->addEvent("dragstart", Javascript::draggable($attr));
247
+		if (isset($dropZone) && $dropZone instanceof BaseHtml) {
248
+			$jqueryDone="append"; $jsCallback="";
249 249
 			extract($parameters);
250
-			$dropZone->asDropZone($jsCallback,$jqueryDone,$parameters);
250
+			$dropZone->asDropZone($jsCallback, $jqueryDone, $parameters);
251 251
 		}
252 252
 		return $this;
253 253
 	}
@@ -259,11 +259,11 @@  discard block
 block discarded – undo
259 259
 	 * @param array $parameters
260 260
 	 * @return \Ajax\common\html\BaseHtml
261 261
 	 */
262
-	public function asDropZone($jsCallback="",$jqueryDone="append",$parameters=[]){
262
+	public function asDropZone($jsCallback="", $jqueryDone="append", $parameters=[]) {
263 263
 		$stopPropagation=false;
264
-		$this->addEvent("dragover", '', $stopPropagation,true);
264
+		$this->addEvent("dragover", '', $stopPropagation, true);
265 265
 		extract($parameters);
266
-		$this->addEvent("drop",Javascript::dropZone($jqueryDone,$jsCallback),$stopPropagation,true);
266
+		$this->addEvent("drop", Javascript::dropZone($jqueryDone, $jsCallback), $stopPropagation, true);
267 267
 		return $this;
268 268
 	}
269 269
 
@@ -271,17 +271,17 @@  discard block
 block discarded – undo
271 271
 		return $this->compile();
272 272
 	}
273 273
 
274
-	public function onPostCompile($callback){
274
+	public function onPostCompile($callback) {
275 275
 		$this->_postCompile=$callback;
276 276
 	}
277 277
 
278
-	public function onPreCompile($callback){
278
+	public function onPreCompile($callback) {
279 279
 		$this->_preCompile=$this->addCallback($this->_preCompile, $callback);
280 280
 	}
281 281
 	
282
-	private function addCallback($originalValue,$callback){
283
-		if(isset($originalValue)){
284
-			if(!is_array($originalValue)){
282
+	private function addCallback($originalValue, $callback) {
283
+		if (isset($originalValue)) {
284
+			if (!is_array($originalValue)) {
285 285
 				$result=[$originalValue];
286 286
 			}
287 287
 			$result[]=$callback;
@@ -290,12 +290,12 @@  discard block
 block discarded – undo
290 290
 		return $callback;
291 291
 	}
292 292
 	
293
-	private function callCallback($callable){
294
-		if(\is_callable($callable)){
293
+	private function callCallback($callable) {
294
+		if (\is_callable($callable)) {
295 295
 			return $callable($this);
296 296
 		}
297
-		if(is_array($callable)){
298
-			foreach ($callable as $call){
297
+		if (is_array($callable)) {
298
+			foreach ($callable as $call) {
299 299
 				$this->callCallback($call);
300 300
 			}
301 301
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/ActiveRow.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * @param string $event
22 22
 	 * @param boolean $multiple
23 23
 	 */
24
-	public function __construct($table,$class="active",$event="click",$multiple=false){
24
+	public function __construct($table, $class="active", $event="click", $multiple=false) {
25 25
 		$this->table=$table;
26 26
 		$this->class=$class;
27 27
 		$this->event=$event;
@@ -55,12 +55,12 @@  discard block
 block discarded – undo
55 55
 		return $this;
56 56
 	}
57 57
 
58
-	public function run(){
58
+	public function run() {
59 59
 		$multiple="";
60
-		if(!$this->multiple){
60
+		if (!$this->multiple) {
61 61
 			$multiple="$(this).closest('tbody').children('tr').removeClass('".$this->class."');";
62 62
 		}
63
-		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange","[this]"),false,false);
63
+		$this->table->onRow($this->event, $multiple."$(this).toggleClass('".$this->class."');".$this->table->jsTrigger("activeRowChange", "[this]"), false, false);
64 64
 	}
65 65
 
66 66
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/table/HtmlTable.php 2 patches
Braces   +9 added lines, -6 removed lines patch added patch discarded remove patch
@@ -345,8 +345,9 @@  discard block
 block discarded – undo
345 345
 			$result= $this->getBody()->_addRow($result);
346 346
 		}
347 347
 		if(isset($this->_afterCompileEvents["onNewRow"])){
348
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
349
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
348
+			if(\is_callable($this->_afterCompileEvents["onNewRow"])) {
349
+							$this->_afterCompileEvents["onNewRow"]($result,$object);
350
+			}
350 351
 		}
351 352
 		return $result;
352 353
 	}
@@ -375,8 +376,9 @@  discard block
 block discarded – undo
375 376
 			}
376 377
 		}
377 378
 		$result= parent::run($js);
378
-		if(isset($this->_footer))
379
-			$this->_footer->run($js);
379
+		if(isset($this->_footer)) {
380
+					$this->_footer->run($js);
381
+		}
380 382
 		$this->_runned=true;
381 383
 		return $result;
382 384
 	}
@@ -417,8 +419,9 @@  discard block
 block discarded – undo
417 419
 
418 420
 	public function setColWidth($colIndex,$width){
419 421
 		$part=$this->_getFirstPart();
420
-		if($part!==null && $part->count()>0)
421
-			$part->getCell(0, $colIndex)->setWidth($width);
422
+		if($part!==null && $part->count()>0) {
423
+					$part->getCell(0, $colIndex)->setWidth($width);
424
+		}
422 425
 		return $this;
423 426
 	}
424 427
 
Please login to merge, or discard this patch.
Spacing   +48 added lines, -48 removed lines patch added patch discarded remove patch
@@ -31,10 +31,10 @@  discard block
 block discarded – undo
31 31
 
32 32
 	public function __construct($identifier, $rowCount, $colCount) {
33 33
 		parent::__construct($identifier, "table", "ui table");
34
-		$this->content=array ();
34
+		$this->content=array();
35 35
 		$this->setRowCount($rowCount, $colCount);
36
-		$this->_variations=[ Variation::CELLED,Variation::PADDED,Variation::COMPACT ];
37
-		$this->_compileParts=["thead","tbody","tfoot"];
36
+		$this->_variations=[Variation::CELLED, Variation::PADDED, Variation::COMPACT];
37
+		$this->_compileParts=["thead", "tbody", "tfoot"];
38 38
 		$this->_afterCompileEvents=[];
39 39
 	}
40 40
 
@@ -44,17 +44,17 @@  discard block
 block discarded – undo
44 44
 	 * @return HtmlTableContent
45 45
 	 */
46 46
 	public function getPart($key) {
47
-		if (\array_key_exists($key, $this->content) === false) {
47
+		if (\array_key_exists($key, $this->content)===false) {
48 48
 			$this->content[$key]=new HtmlTableContent("", $key);
49
-			if ($key !== "tbody") {
49
+			if ($key!=="tbody") {
50 50
 				$this->content[$key]->setRowCount(1, $this->_colCount);
51 51
 			}
52 52
 		}
53 53
 		return $this->content[$key];
54 54
 	}
55 55
 
56
-	protected function _getFirstPart(){
57
-		if(isset($this->content["thead"])){
56
+	protected function _getFirstPart() {
57
+		if (isset($this->content["thead"])) {
58 58
 			return $this->content["thead"];
59 59
 		}
60 60
 		return $this->content["tbody"];
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 	 * @return boolean
100 100
 	 */
101 101
 	public function hasPart($key) {
102
-		return \array_key_exists($key, $this->content) === true;
102
+		return \array_key_exists($key, $this->content)===true;
103 103
 	}
104 104
 
105 105
 	/**
@@ -259,8 +259,8 @@  discard block
 block discarded – undo
259 259
 		return $this->colAlign($colIndex, "colLeftFromRight");
260 260
 	}
261 261
 
262
-	public function setColAlignment($colIndex,$alignment){
263
-		switch ($alignment){
262
+	public function setColAlignment($colIndex, $alignment) {
263
+		switch ($alignment) {
264 264
 			case TextAlignment::LEFT:
265 265
 				$function="colLeft";
266 266
 				break;
@@ -280,8 +280,8 @@  discard block
 block discarded – undo
280 280
 		return $this;
281 281
 	}
282 282
 	
283
-	public function setColAlignmentFromRight($colIndex,$alignment){
284
-		switch ($alignment){
283
+	public function setColAlignmentFromRight($colIndex, $alignment) {
284
+		switch ($alignment) {
285 285
 			case TextAlignment::LEFT:
286 286
 				$function="colLeftFromRight";
287 287
 				break;
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 
304 304
 	private function colAlign($colIndex, $function) {
305 305
 		if (\is_array($colIndex)) {
306
-			foreach ( $colIndex as $cIndex ) {
306
+			foreach ($colIndex as $cIndex) {
307 307
 				$this->colAlign($cIndex, $function);
308 308
 			}
309 309
 		} else {
@@ -364,7 +364,7 @@  discard block
 block discarded – undo
364 364
 	 * @see HtmlSemDoubleElement::compile()
365 365
 	 */
366 366
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
367
-		if(\sizeof($this->_compileParts)<3){
367
+		if (\sizeof($this->_compileParts)<3) {
368 368
 			$this->_template="%content%";
369 369
 			$this->refresh($js);
370 370
 		}
@@ -373,9 +373,9 @@  discard block
 block discarded – undo
373 373
 	}
374 374
 
375 375
 	protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
376
-		parent::compile_once($js,$view);
376
+		parent::compile_once($js, $view);
377 377
 		if ($this->propertyContains("class", "sortable")) {
378
-			$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
378
+			$this->addEvent("execute", "$('#".$this->identifier."').tablesort().data('tablesort').sort($('th.default-sort'));");
379 379
 		}
380 380
 	}
381 381
 
@@ -388,13 +388,13 @@  discard block
 block discarded – undo
388 388
 	public function fromDatabaseObject($object, $function) {
389 389
 		$result=$function($object);
390 390
 		if (\is_array($result)) {
391
-			$result= $this->addRow($function($object));
391
+			$result=$this->addRow($function($object));
392 392
 		} else {
393
-			$result= $this->getBody()->_addRow($result);
393
+			$result=$this->getBody()->_addRow($result);
394 394
 		}
395
-		if(isset($this->_afterCompileEvents["onNewRow"])){
396
-			if(\is_callable($this->_afterCompileEvents["onNewRow"]))
397
-				$this->_afterCompileEvents["onNewRow"]($result,$object);
395
+		if (isset($this->_afterCompileEvents["onNewRow"])) {
396
+			if (\is_callable($this->_afterCompileEvents["onNewRow"]))
397
+				$this->_afterCompileEvents["onNewRow"]($result, $object);
398 398
 		}
399 399
 		return $result;
400 400
 	}
@@ -409,21 +409,21 @@  discard block
 block discarded – undo
409 409
 		return $this;
410 410
 	}
411 411
 
412
-	public function refresh($js){
412
+	public function refresh($js) {
413 413
 		$this->_footer=$this->getFooter();
414
-		if(isset($js)){
415
-			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");',true);
414
+		if (isset($js)) {
415
+			$js->exec('$("#'.$this->identifier.' tfoot").replaceWith("'.\addslashes($this->_footer).'");', true);
416 416
 		}
417 417
 	}
418 418
 
419
-	public function run(JsUtils $js){
420
-		if(!$this->_runned){
421
-			if(isset($this->_activeRowSelector)){
419
+	public function run(JsUtils $js) {
420
+		if (!$this->_runned) {
421
+			if (isset($this->_activeRowSelector)) {
422 422
 				$this->_activeRowSelector->run();
423 423
 			}
424 424
 		}
425
-		$result= parent::run($js);
426
-		if(isset($this->_footer))
425
+		$result=parent::run($js);
426
+		if (isset($this->_footer))
427 427
 			$this->_footer->run($js);
428 428
 		$this->_runned=true;
429 429
 		return $result;
@@ -447,47 +447,47 @@  discard block
 block discarded – undo
447 447
 	 * @param boolean $multiple
448 448
 	 * @return HtmlTable
449 449
 	 */
450
-	public function setActiveRowSelector($class="active",$event="click",$multiple=false){
451
-		$this->_activeRowSelector=new ActiveRow($this,$class,$event,$multiple);
450
+	public function setActiveRowSelector($class="active", $event="click", $multiple=false) {
451
+		$this->_activeRowSelector=new ActiveRow($this, $class, $event, $multiple);
452 452
 		return $this;
453 453
 	}
454 454
 
455
-	public function hideColumn($colIndex){
456
-		if(isset($this->content["thead"])){
455
+	public function hideColumn($colIndex) {
456
+		if (isset($this->content["thead"])) {
457 457
 			$this->content["thead"]->hideColumn($colIndex);
458 458
 		}
459 459
 		$this->content["tbody"]->hideColumn($colIndex);
460
-		if(isset($this->content["tfoot"])){
460
+		if (isset($this->content["tfoot"])) {
461 461
 			$this->content["tfoot"]->hideColumn($colIndex);
462 462
 		}
463 463
 		return $this;
464 464
 	}
465 465
 
466
-	public function setColWidth($colIndex,$width){
466
+	public function setColWidth($colIndex, $width) {
467 467
 		$part=$this->_getFirstPart();
468
-		if($part!==null && $part->count()>0)
468
+		if ($part!==null && $part->count()>0)
469 469
 			$part->getCell(0, $colIndex)->setWidth($width);
470 470
 		return $this;
471 471
 	}
472 472
 
473
-	public function setColWidths($widths){
473
+	public function setColWidths($widths) {
474 474
 		$part=$this->_getFirstPart();
475
-		if($part!==null && $part->count()>0){
475
+		if ($part!==null && $part->count()>0) {
476 476
 			$count=$part->getColCount();
477
-			if(!\is_array($widths)){
477
+			if (!\is_array($widths)) {
478 478
 				$widths=\array_fill(0, $count, $widths);
479 479
 			}
480
-			$max=\min(\sizeof($widths),$count);
481
-			for($i=0;$i<$max;$i++){
480
+			$max=\min(\sizeof($widths), $count);
481
+			for ($i=0; $i<$max; $i++) {
482 482
 				$part->getCell(0, $i)->setWidth($widths[$i]);
483 483
 			}
484 484
 		}
485 485
 		return $this;
486 486
 	}
487 487
 
488
-	public function mergeIdentiqualValues($colIndex,$function="strip_tags"){
488
+	public function mergeIdentiqualValues($colIndex, $function="strip_tags") {
489 489
 		$body=$this->getBody();
490
-		$body->mergeIdentiqualValues($colIndex,$function);
490
+		$body->mergeIdentiqualValues($colIndex, $function);
491 491
 		return $this;
492 492
 	}
493 493
 	/**
@@ -501,16 +501,16 @@  discard block
 block discarded – undo
501 501
 	 * @param mixed $_innerScript
502 502
 	 */
503 503
 	public function setInnerScript($_innerScript) {
504
-		$this->_innerScript = $_innerScript;
504
+		$this->_innerScript=$_innerScript;
505 505
 	}
506 506
 	
507
-	public function onActiveRowChange($jsCode){
508
-		$this->on("activeRowChange",$jsCode);
507
+	public function onActiveRowChange($jsCode) {
508
+		$this->on("activeRowChange", $jsCode);
509 509
 		return $this;
510 510
 	}
511 511
 	
512
-	public function addMergeRow($colCount,$value=null){
513
-		return $this->getBody()->addMergeRow($colCount,$value);
512
+	public function addMergeRow($colCount, $value=null) {
513
+		return $this->getBody()->addMergeRow($colCount, $value);
514 514
 	}
515 515
 
516 516
 }
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlPaginationMenu.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -6,32 +6,32 @@  discard block
 block discarded – undo
6 6
 
7 7
 use Ajax\semantic\html\elements\HtmlIcon;
8 8
 
9
-class HtmlPaginationMenu extends HtmlMenu{
9
+class HtmlPaginationMenu extends HtmlMenu {
10 10
 	private $_page;
11 11
 	private $_pages;
12 12
 	private $_max;
13
-	public function __construct( $identifier, $items=array() ){
14
-		parent::__construct( $identifier,$items);
13
+	public function __construct($identifier, $items=array()) {
14
+		parent::__construct($identifier, $items);
15 15
 		$this->_pages=$items;
16 16
 	}
17 17
 	/**
18 18
 	 * {@inheritDoc}
19 19
 	 * @see \Ajax\common\html\BaseHtml::compile()
20 20
 	 */
21
-	public function compile(JsUtils $js=NULL,&$view=NULL){
21
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
22 22
 		$max=$this->_max;
23
-		if(!$this->_compiled){
24
-			foreach ($this->content as $item){
23
+		if (!$this->_compiled) {
24
+			foreach ($this->content as $item) {
25 25
 				$item->addClass("pageNum");
26 26
 			}
27
-			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1,$this->_page-1]))->addToProperty("class","_firstPage no-active");
28
-			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max,$this->_page+1]))->setProperty("data-max", $max)->addToProperty("class","_lastPage no-active");
27
+			$this->insertItem(new HtmlIcon("", "left chevron"))->setProperty("data-page", \max([1, $this->_page-1]))->addToProperty("class", "_firstPage no-active");
28
+			$this->addItem(new HtmlIcon("", "right chevron"))->setProperty("data-page", \min([$max, $this->_page+1]))->setProperty("data-max", $max)->addToProperty("class", "_lastPage no-active");
29 29
 			$this->asPagination();
30 30
 		}
31
-		return parent::compile($js,$view);
31
+		return parent::compile($js, $view);
32 32
 	}
33 33
 
34
-	public function setActivePage($page){
34
+	public function setActivePage($page) {
35 35
 		$index=$page-$this->_pages[0];
36 36
 		$this->setActiveItem($index);
37 37
 		$this->_page=$page;
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
 	 * @param mixed $_max
46 46
 	 */
47 47
 	public function setMax($_max) {
48
-		$this->_max = $_max;
48
+		$this->_max=$_max;
49 49
 	}
50 50
 
51 51
 
Please login to merge, or discard this patch.