Completed
Push — master ( bbe42f...a98604 )
by Jean-Christophe
03:13
created
Ajax/common/html/BaseHtml.php 1 patch
Doc Comments   +17 added lines patch added patch discarded remove patch
@@ -63,6 +63,10 @@  discard block
 block discarded – undo
63 63
 
64 64
 
65 65
 
66
+	/**
67
+	 * @param string $name
68
+	 * @param string[] $typeCtrl
69
+	 */
66 70
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
67 71
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
68 72
 			return $name=$value;
@@ -80,6 +84,10 @@  discard block
 block discarded – undo
80 84
 
81 85
 
82 86
 
87
+	/**
88
+	 * @param string $name
89
+	 * @param string[] $typeCtrl
90
+	 */
83 91
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
84 92
 		if ($this->ctrl($name, $value, $typeCtrl) === true) {
85 93
 			if (\is_array($typeCtrl)) {
@@ -90,6 +98,9 @@  discard block
 block discarded – undo
90 98
 		return $this;
91 99
 	}
92 100
 
101
+	/**
102
+	 * @param string $name
103
+	 */
93 104
 	protected function addToMember(&$name, $value, $separator=" ") {
94 105
 		$name=str_ireplace($value, "", $name) . $separator . $value;
95 106
 		return $this;
@@ -102,6 +113,9 @@  discard block
 block discarded – undo
102 113
 		$oldValue=trim($oldValue);
103 114
 	}
104 115
 
116
+	/**
117
+	 * @param \Closure $callback
118
+	 */
105 119
 	protected function _getElementBy($callback,$elements){
106 120
 		if (\is_array($elements)) {
107 121
 			$elements=\array_values($elements);
@@ -183,6 +197,9 @@  discard block
 block discarded – undo
183 197
 		return $this->_bsComponent;
184 198
 	}
185 199
 
200
+	/**
201
+	 * @param \Ajax\semantic\components\Form $bsComponent
202
+	 */
186 203
 	public function setBsComponent($bsComponent) {
187 204
 		$this->_bsComponent=$bsComponent;
188 205
 		return $this;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php 1 patch
Doc Comments   +27 added lines, -6 removed lines patch added patch discarded remove patch
@@ -14,15 +14,28 @@  discard block
 block discarded – undo
14 14
  * @property InstanceViewer $_instanceViewer
15 15
  */
16 16
 trait DataTableFieldAsTrait{
17
+
18
+	/**
19
+	 * @param \Closure $field
20
+	 */
17 21
 	abstract public function addField($field);
22
+
23
+	/**
24
+	 * @param integer $index
25
+	 * @param \Closure $field
26
+	 */
18 27
 	abstract public function insertField($index,$field);
28
+
29
+	/**
30
+	 * @param \Closure $field
31
+	 */
19 32
 	abstract public function insertInField($index,$field);
20 33
 	abstract public function fieldAs($index,$type,$attributes=NULL);
21 34
 	/**
22 35
 	 * @param string $caption
23 36
 	 * @param callable $callback
24 37
 	 * @param boolean $visibleHover
25
-	 * @return callable
38
+	 * @return \Closure
26 39
 	 */
27 40
 	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
28 41
 		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
@@ -32,7 +45,7 @@  discard block
 block discarded – undo
32 45
 	 * @param callable $thisCallback
33 46
 	 * @param array $parameters
34 47
 	 * @param callable $callback
35
-	 * @return callable
48
+	 * @return \Closure
36 49
 	 */
37 50
 	private function getCallable($thisCallback,$parameters,$callback=null){
38 51
 		$result=function($instance) use($thisCallback,$parameters,$callback){
@@ -94,7 +107,7 @@  discard block
 block discarded – undo
94 107
 	 * @param string $caption
95 108
 	 * @param callable $callback
96 109
 	 * @param boolean $visibleHover
97
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
110
+	 * @return DataTableFieldAsTrait
98 111
 	 */
99 112
 	public function addFieldButton($caption,$visibleHover=true,$callback=null){
100 113
 		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
@@ -106,7 +119,7 @@  discard block
 block discarded – undo
106 119
 	 * @param int $index
107 120
 	 * @param string $caption
108 121
 	 * @param callable $callback
109
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
122
+	 * @return DataTableFieldAsTrait
110 123
 	 */
111 124
 	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
112 125
 		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
@@ -118,18 +131,26 @@  discard block
 block discarded – undo
118 131
 	 * @param int $index
119 132
 	 * @param string $caption
120 133
 	 * @param callable $callback
121
-	 * @return \Ajax\semantic\widgets\datatable\DataTable
134
+	 * @return DataTableFieldAsTrait
122 135
 	 */
123 136
 	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
124 137
 		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
125 138
 		return $this;
126 139
 	}
127 140
 
141
+	/**
142
+	 * @param string $icon
143
+	 * @param string $class
144
+	 */
128 145
 	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
129 146
 		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
130 147
 		return $this;
131 148
 	}
132 149
 
150
+	/**
151
+	 * @param string $icon
152
+	 * @param string $class
153
+	 */
133 154
 	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
134 155
 		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
135 156
 		return $this;
@@ -147,7 +168,7 @@  discard block
 block discarded – undo
147 168
 	 * @param boolean $visibleHover
148 169
 	 * @param array $deleteBehavior
149 170
 	 * @param callable $callback
150
-	 * @return DataTable
171
+	 * @return DataTableFieldAsTrait
151 172
 	 */
152 173
 	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
153 174
 		$this->_deleteBehavior=$deleteBehavior;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Braces   +35 added lines, -24 removed lines patch added patch discarded remove patch
@@ -58,10 +58,12 @@  discard block
 block discarded – undo
58 58
 			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
59 59
 			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
60 60
 		}
61
-		if(\is_array($this->_deleteBehavior))
62
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
63
-		if(\is_array($this->_editBehavior))
64
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
61
+		if(\is_array($this->_deleteBehavior)) {
62
+					$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
63
+		}
64
+		if(\is_array($this->_editBehavior)) {
65
+					$this->_generateBehavior("edit",$this->_editBehavior,$js);
66
+		}
65 67
 		return parent::run($js);
66 68
 	}
67 69
 
@@ -94,8 +96,9 @@  discard block
 block discarded – undo
94 96
 			$table->setRowCount(0, \sizeof($captions));
95 97
 			$this->_generateHeader($table,$captions);
96 98
 
97
-			if(isset($this->_compileParts))
98
-				$table->setCompileParts($this->_compileParts);
99
+			if(isset($this->_compileParts)) {
100
+							$table->setCompileParts($this->_compileParts);
101
+			}
99 102
 
100 103
 			$this->_generateContent($table);
101 104
 
@@ -126,8 +129,9 @@  discard block
 block discarded – undo
126 129
 	}
127 130
 
128 131
 	protected function _applyStyleAttributes($table){
129
-		if(isset($this->_hiddenColumns))
130
-			$this->_hideColumns();
132
+		if(isset($this->_hiddenColumns)) {
133
+					$this->_hideColumns();
134
+		}
131 135
 			if(isset($this->_colWidths)){
132 136
 				foreach ($this->_colWidths as $colIndex=>$width){
133 137
 					$table->setColWidth($colIndex,$width);
@@ -178,8 +182,9 @@  discard block
 block discarded – undo
178 182
 			$field=$ck->getField();
179 183
 			$field->setProperty("value",$id);
180 184
 			$field->setProperty("name", "selection[]");
181
-			if(isset($checkedClass))
182
-				$field->setClass($checkedClass);
185
+			if(isset($checkedClass)) {
186
+							$field->setClass($checkedClass);
187
+			}
183 188
 			\array_unshift($values, $ck);
184 189
 		}
185 190
 		$result=$table->newRow();
@@ -192,8 +197,9 @@  discard block
 block discarded – undo
192 197
 
193 198
 	protected function _generatePagination($table,$js=NULL){
194 199
 		if(isset($this->_toolbar)){
195
-			if($this->_toolbarPosition==PositionInTable::FOOTER)
196
-				$this->_toolbar->setFloated("left");
200
+			if($this->_toolbarPosition==PositionInTable::FOOTER) {
201
+							$this->_toolbar->setFloated("left");
202
+			}
197 203
 		}
198 204
 		$footer=$table->getFooter();
199 205
 		$footer->mergeCol();
@@ -212,8 +218,9 @@  discard block
 block discarded – undo
212 218
 
213 219
 	protected function _getFieldName($index){
214 220
 		$fieldName=parent::_getFieldName($index);
215
-		if(\is_object($fieldName))
216
-			$fieldName="field-".$index;
221
+		if(\is_object($fieldName)) {
222
+					$fieldName="field-".$index;
223
+		}
217 224
 		return $fieldName."[]";
218 225
 	}
219 226
 
@@ -253,7 +260,7 @@  discard block
 block discarded – undo
253 260
 		$hasPart=$table->hasPart($part);
254 261
 		if($hasPart){
255 262
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
256
-		}else{
263
+		} else{
257 264
 			$row=$table->getPart($part)->getRow(0);
258 265
 		}
259 266
 		$row->mergeCol();
@@ -283,7 +290,7 @@  discard block
 block discarded – undo
283 290
 			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
284 291
 			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
285 292
 			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
286
-		}else{
293
+		} else{
287 294
 			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
288 295
 		}
289 296
 		return $this;
@@ -357,8 +364,9 @@  discard block
 block discarded – undo
357 364
 
358 365
 	protected function getTargetSelector() {
359 366
 		$result=$this->_targetSelector;
360
-		if(!isset($result))
361
-			$result="#".$this->identifier;
367
+		if(!isset($result)) {
368
+					$result="#".$this->identifier;
369
+		}
362 370
 		return $result;
363 371
 	}
364 372
 
@@ -373,8 +381,9 @@  discard block
 block discarded – undo
373 381
 	}
374 382
 
375 383
 	public function getRefreshSelector() {
376
-		if(isset($this->_refreshSelector))
377
-			return $this->_refreshSelector;
384
+		if(isset($this->_refreshSelector)) {
385
+					return $this->_refreshSelector;
386
+		}
378 387
 		return "#".$this->identifier." tbody";
379 388
 	}
380 389
 
@@ -393,8 +402,9 @@  discard block
 block discarded – undo
393 402
 	 */
394 403
 	public function show($modelInstance){
395 404
 		if(\is_array($modelInstance)){
396
-			if(\is_array(array_values($modelInstance)[0]))
397
-				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
405
+			if(\is_array(array_values($modelInstance)[0])) {
406
+							$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
407
+			}
398 408
 		}
399 409
 		$this->_modelInstance=$modelInstance;
400 410
 	}
@@ -434,8 +444,9 @@  discard block
 block discarded – undo
434 444
 	}
435 445
 
436 446
 	public function hideColumn($colIndex){
437
-		if(!\is_array($this->_hiddenColumns))
438
-			$this->_hiddenColumns=[];
447
+		if(!\is_array($this->_hiddenColumns)) {
448
+					$this->_hiddenColumns=[];
449
+		}
439 450
 		$this->_hiddenColumns[]=$colIndex;
440 451
 		return $this;
441 452
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/base/traits/BaseTrait.php 1 patch
Braces   +28 added lines, -20 removed lines patch added patch discarded remove patch
@@ -48,8 +48,9 @@  discard block
 block discarded – undo
48 48
 
49 49
 	public function setVariations($variations) {
50 50
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
51
-		if (\is_string($variations))
52
-			$variations=\explode(" ", $variations);
51
+		if (\is_string($variations)) {
52
+					$variations=\explode(" ", $variations);
53
+		}
53 54
 		foreach ( $variations as $variation ) {
54 55
 			$this->_self->addVariation($variation);
55 56
 		}
@@ -62,8 +63,9 @@  discard block
 block discarded – undo
62 63
 	}
63 64
 
64 65
 	public function addVariations($variations=array()) {
65
-		if (\is_string($variations))
66
-			$variations=\explode(" ", $variations);
66
+		if (\is_string($variations)) {
67
+					$variations=\explode(" ", $variations);
68
+		}
67 69
 		foreach ( $variations as $variation ) {
68 70
 			$this->_self->addVariation($variation);
69 71
 		}
@@ -71,8 +73,9 @@  discard block
 block discarded – undo
71 73
 	}
72 74
 
73 75
 	public function addStates($states=array()) {
74
-		if (\is_string($states))
75
-			$states=\explode(" ", $states);
76
+		if (\is_string($states)) {
77
+					$states=\explode(" ", $states);
78
+		}
76 79
 		foreach ( $states as $state ) {
77 80
 			$this->_self->addState($state);
78 81
 		}
@@ -81,8 +84,9 @@  discard block
 block discarded – undo
81 84
 
82 85
 	public function setStates($states) {
83 86
 		$this->_self->setProperty("class", $this->_self->getBaseClass());
84
-		if (\is_string($states))
85
-			$states=\explode(" ", $states);
87
+		if (\is_string($states)) {
88
+					$states=\explode(" ", $states);
89
+		}
86 90
 		foreach ( $states as $state ) {
87 91
 			$this->_self->addState($state);
88 92
 		}
@@ -114,8 +118,9 @@  discard block
 block discarded – undo
114 118
 	 * @return HtmlSemDoubleElement
115 119
 	 */
116 120
 	public function setDisabled($disable=true) {
117
-		if($disable)
118
-			$this->_self->addToProperty("class", "disabled");
121
+		if($disable) {
122
+					$this->_self->addToProperty("class", "disabled");
123
+		}
119 124
 		return $this;
120 125
 	}
121 126
 
@@ -149,14 +154,16 @@  discard block
 block discarded – undo
149 154
 	 * @return HtmlSemDoubleElement
150 155
 	 */
151 156
 	public function setActive($value=true){
152
-		if($value)
153
-			$this->_self->addToProperty("class", "active");
157
+		if($value) {
158
+					$this->_self->addToProperty("class", "active");
159
+		}
154 160
 		return $this;
155 161
 	}
156 162
 
157 163
 	public function setAttached($value=true){
158
-		if($value)
159
-			$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
164
+		if($value) {
165
+					$this->_self->addToPropertyCtrl("class", "attached", array ("attached" ));
166
+		}
160 167
 		return $this;
161 168
 	}
162 169
 
@@ -166,9 +173,9 @@  discard block
 block discarded – undo
166 173
 	public function setInverted($recursive=true) {
167 174
 		if($recursive===true){
168 175
 			$content=$this->_self->getContent();
169
-			if($content instanceof HtmlSemDoubleElement)
170
-				$content->setInverted($recursive);
171
-			elseif(\is_array($content) || $content instanceof \Traversable){
176
+			if($content instanceof HtmlSemDoubleElement) {
177
+							$content->setInverted($recursive);
178
+			} elseif(\is_array($content) || $content instanceof \Traversable){
172 179
 				foreach ($content as $elm){
173 180
 					if($elm instanceof  HtmlSemDoubleElement){
174 181
 						$elm->setInverted($recursive);
@@ -204,9 +211,10 @@  discard block
 block discarded – undo
204 211
 			if(isset($array[$key])){
205 212
 				$p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, "");
206 213
 				$array[$key]=$before.$p.$value.$after;
207
-			}else
208
-				$array[$key]=$before.$value.$after;
209
-		}else{
214
+			} else {
215
+							$array[$key]=$before.$value.$after;
216
+			}
217
+		} else{
210 218
 			$array[$key]=$value;
211 219
 		}
212 220
 		return $this;
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsInternalTrait.php 1 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
 	 */
17 17
 	protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){
18 18
 		if ($library!=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
 			}
@@ -37,7 +38,9 @@  discard block
 block discarded – undo
37 38
 	}
38 39
 
39 40
 	protected function minify($input) {
40
-		if(trim($input) === "") return $input;
41
+		if(trim($input) === "") {
42
+			return $input;
43
+		}
41 44
 		return preg_replace(
42 45
 				array(
43 46
 						// Remove comment(s)
Please login to merge, or discard this patch.