Completed
Push — master ( 1b9fb1...489615 )
by Jean-Christophe
04:43 queued 01:34
created
Ajax/common/html/HtmlSingleElement.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	}
14 14
 
15 15
 	public function setClass($classNames) {
16
-		if(\is_array($classNames)){
16
+		if (\is_array($classNames)) {
17 17
 			$classNames=implode(" ", $classNames);
18 18
 		}
19 19
 		$this->setProperty("class", $classNames);
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	}
22 22
 
23 23
 	public function addClass($classNames) {
24
-		if(\is_array($classNames)){
24
+		if (\is_array($classNames)) {
25 25
 			$classNames=implode(" ", $classNames);
26 26
 		}
27 27
 		$this->addToProperty("class", $classNames);
@@ -52,7 +52,7 @@  discard block
 block discarded – undo
52 52
 	 */
53 53
 	public function fromArray($array) {
54 54
 		$array=parent::fromArray($array);
55
-		foreach ( $array as $key => $value ) {
55
+		foreach ($array as $key => $value) {
56 56
 			$this->setProperty($key, $value);
57 57
 		}
58 58
 		return $array;
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
  *
24 24
  */
25 25
 class DataTable extends Widget {
26
-	use TableTrait,DataTableFieldAsTrait;
26
+	use TableTrait, DataTableFieldAsTrait;
27 27
 	protected $_searchField;
28 28
 	protected $_urls;
29 29
 	protected $_pagination;
@@ -36,30 +36,30 @@  discard block
 block discarded – undo
36 36
 	protected $_targetSelector;
37 37
 	protected $_checkedMessage;
38 38
 
39
-	public function __construct($identifier,$model,$modelInstance=NULL) {
40
-		parent::__construct($identifier, $model,$modelInstance);
41
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
39
+	public function __construct($identifier, $model, $modelInstance=NULL) {
40
+		parent::__construct($identifier, $model, $modelInstance);
41
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
42 42
 		$this->_urls=[];
43 43
 	}
44 44
 
45
-	public function run(JsUtils $js){
46
-		if($this->_hasCheckboxes && isset($js)){
45
+	public function run(JsUtils $js) {
46
+		if ($this->_hasCheckboxes && isset($js)) {
47 47
 			$this->_runCheckboxes($js);
48 48
 		}
49
-		if($this->_visibleHover){
50
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
51
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
49
+		if ($this->_visibleHover) {
50
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
51
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
52 52
 		}
53
-		if($this->_hasDelete)
53
+		if ($this->_hasDelete)
54 54
 			$this->_generateBehavior("delete", $js);
55
-		if($this->_hasEdit)
55
+		if ($this->_hasEdit)
56 56
 			$this->_generateBehavior("edit", $js);
57 57
 		return parent::run($js);
58 58
 	}
59 59
 
60
-	protected function _runCheckboxes(JsUtils $js){
60
+	protected function _runCheckboxes(JsUtils $js) {
61 61
 		$checkedMessageCall="";
62
-		if($this->_hasCheckedMessage){
62
+		if ($this->_hasCheckedMessage) {
63 63
 			$msg=$this->getCheckedMessage();
64 64
 			$checkedMessageFunction="function updateChecked(){var msg='".$msg[0]."',count=\$('#{$this->identifier} [name=\"selection[]\"]:checked').length,all=\$('#{$this->identifier} [name=\"selection[]\"]').length;
65 65
 			if(count==1) msg='".$msg[1]."';
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 						\$('#checked-count-".$this->identifier."').contents().filter(function() {return this.nodeType == 3;}).each(function(){this.textContent = msg.replace('{count}',count);});
68 68
 								\$('#toolbar-{$this->identifier} .visibleOnChecked').toggle(count>0);}\$('#toolbar-".$this->identifier." .visibleOnChecked').hide();";
69 69
 			$checkedMessageCall="updateChecked();";
70
-			$js->exec($checkedMessageFunction,true);
70
+			$js->exec($checkedMessageFunction, true);
71 71
 		}
72 72
 		$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
73 73
 				var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
76 76
 	}
77 77
 
78
-	protected function _generateBehavior($op,JsUtils $js){
79
-		if(isset($this->_urls[$op]))
80
-			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op],$this->getTargetSelector(),["preventDefault"=>false,"attr"=>"data-ajax"]);
78
+	protected function _generateBehavior($op, JsUtils $js) {
79
+		if (isset($this->_urls[$op]))
80
+			$js->getOnClick("#".$this->identifier." .".$op, $this->_urls[$op], $this->getTargetSelector(), ["preventDefault"=>false, "attr"=>"data-ajax"]);
81 81
 	}
82 82
 
83 83
 	/**
@@ -89,70 +89,70 @@  discard block
 block discarded – undo
89 89
 	}
90 90
 
91 91
 
92
-	public function compile(JsUtils $js=NULL,&$view=NULL){
93
-		if(!$this->_generated){
92
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
93
+		if (!$this->_generated) {
94 94
 			$this->_instanceViewer->setInstance($this->_model);
95 95
 			$captions=$this->_instanceViewer->getCaptions();
96 96
 
97 97
 			$table=$this->content["table"];
98 98
 
99
-			if($this->_hasCheckboxes){
99
+			if ($this->_hasCheckboxes) {
100 100
 				$this->_generateMainCheckbox($captions);
101 101
 			}
102 102
 
103 103
 			$table->setRowCount(0, \sizeof($captions));
104 104
 			$table->setHeaderValues($captions);
105
-			if(isset($this->_compileParts))
105
+			if (isset($this->_compileParts))
106 106
 				$table->setCompileParts($this->_compileParts);
107 107
 
108
-			if(isset($this->_searchField) && isset($js)){
109
-				if(isset($this->_urls["refresh"]))
110
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
108
+			if (isset($this->_searchField) && isset($js)) {
109
+				if (isset($this->_urls["refresh"]))
110
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
111 111
 			}
112 112
 
113 113
 			$this->_generateContent($table);
114 114
 
115
-			if($this->_hasCheckboxes && $table->hasPart("thead")){
115
+			if ($this->_hasCheckboxes && $table->hasPart("thead")) {
116 116
 					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
117 117
 			}
118 118
 
119
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
119
+			if (isset($this->_pagination) && $this->_pagination->getVisible()) {
120 120
 				$this->_generatePagination($table);
121 121
 			}
122
-			if(isset($this->_toolbar)){
122
+			if (isset($this->_toolbar)) {
123 123
 				$this->_setToolbarPosition($table, $captions);
124 124
 			}
125
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
125
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
126 126
 			$this->_compileForm();
127 127
 			$this->_generated=true;
128 128
 		}
129
-		return parent::compile($js,$view);
129
+		return parent::compile($js, $view);
130 130
 	}
131 131
 
132
-	private function _generateMainCheckbox(&$captions){
133
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
132
+	private function _generateMainCheckbox(&$captions) {
133
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
134 134
 		$checkedMessageCall="";
135
-		if($this->_hasCheckedMessage)
135
+		if ($this->_hasCheckedMessage)
136 136
 			$checkedMessageCall="updateChecked();";
137 137
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);".$checkedMessageCall);
138 138
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);".$checkedMessageCall);
139 139
 		\array_unshift($captions, $ck);
140 140
 	}
141 141
 
142
-	protected function _generateContent($table){
142
+	protected function _generateContent($table) {
143 143
 		$objects=$this->_modelInstance;
144
-		if(isset($this->_pagination)){
144
+		if (isset($this->_pagination)) {
145 145
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
146 146
 		}
147 147
 		InstanceViewer::setIndex(0);
148 148
 		$table->fromDatabaseObjects($objects, function($instance) use($table){
149 149
 			$this->_instanceViewer->setInstance($instance);
150 150
 			InstanceViewer::$index++;
151
-			$values= $this->_instanceViewer->getValues();
152
-			if($this->_hasCheckboxes){
153
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
151
+			$values=$this->_instanceViewer->getValues();
152
+			if ($this->_hasCheckboxes) {
153
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
154 154
 				$field=$ck->getField();
155
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
155
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
156 156
 				$field->setProperty("name", "selection[]");
157 157
 				\array_unshift($values, $ck);
158 158
 			}
@@ -163,37 +163,37 @@  discard block
 block discarded – undo
163 163
 		});
164 164
 	}
165 165
 
166
-	private function _generatePagination($table){
166
+	private function _generatePagination($table) {
167 167
 		$footer=$table->getFooter();
168 168
 		$footer->mergeCol();
169
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
169
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
170 170
 		$menu->floatRight();
171 171
 		$menu->setActiveItem($this->_pagination->getPage()-1);
172 172
 		$footer->setValues($menu);
173
-		if(isset($this->_urls["refresh"]))
174
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
173
+		if (isset($this->_urls["refresh"]))
174
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
175 175
 	}
176 176
 
177
-	protected function _getFieldName($index){
177
+	protected function _getFieldName($index) {
178 178
 		return parent::_getFieldName($index)."[]";
179 179
 	}
180 180
 
181
-	protected function _getFieldCaption($index){
181
+	protected function _getFieldCaption($index) {
182 182
 		return null;
183 183
 	}
184 184
 
185
-	protected function _setToolbarPosition($table,$captions=NULL){
186
-		switch ($this->_toolbarPosition){
185
+	protected function _setToolbarPosition($table, $captions=NULL) {
186
+		switch ($this->_toolbarPosition) {
187 187
 			case PositionInTable::BEFORETABLE:
188 188
 			case PositionInTable::AFTERTABLE:
189
-				if(isset($this->_compileParts)===false){
189
+				if (isset($this->_compileParts)===false) {
190 190
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
191 191
 				}
192 192
 				break;
193 193
 			case PositionInTable::HEADER:
194 194
 			case PositionInTable::FOOTER:
195 195
 			case PositionInTable::BODY:
196
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
196
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
197 197
 				break;
198 198
 		}
199 199
 	}
@@ -205,23 +205,23 @@  discard block
 block discarded – undo
205 205
 	 * @param callable $callback function called after the field compilation
206 206
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
207 207
 	 */
208
-	public function afterCompile($index,$callback){
209
-		$this->_instanceViewer->afterCompile($index,$callback);
208
+	public function afterCompile($index, $callback) {
209
+		$this->_instanceViewer->afterCompile($index, $callback);
210 210
 		return $this;
211 211
 	}
212 212
 
213
-	private function addToolbarRow($part,$table,$captions){
213
+	private function addToolbarRow($part, $table, $captions) {
214 214
 		$hasPart=$table->hasPart($part);
215
-		if($hasPart){
215
+		if ($hasPart) {
216 216
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
217
-		}else{
217
+		} else {
218 218
 			$row=$table->getPart($part)->getRow(0);
219 219
 		}
220 220
 		$row->mergeCol();
221 221
 		$row->setValues([$this->_toolbar]);
222 222
 	}
223 223
 
224
-	public function getHtmlComponent(){
224
+	public function getHtmlComponent() {
225 225
 		return $this->content["table"];
226 226
 	}
227 227
 
@@ -235,18 +235,18 @@  discard block
 block discarded – undo
235 235
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
236 236
 	 */
237 237
 	public function setUrls($urls) {
238
-		if(\is_array($urls)){
239
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
240
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
241
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
242
-		}else{
243
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
238
+		if (\is_array($urls)) {
239
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
240
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
241
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
242
+		} else {
243
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
244 244
 		}
245 245
 		return $this;
246 246
 	}
247 247
 
248
-	public function paginate($items_per_page=10,$page=1){
249
-		$this->_pagination=new Pagination($items_per_page,4,$page);
248
+	public function paginate($items_per_page=10, $page=1) {
249
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
250 250
 	}
251 251
 
252 252
 	public function getHasCheckboxes() {
@@ -258,20 +258,20 @@  discard block
 block discarded – undo
258 258
 		return $this;
259 259
 	}
260 260
 
261
-	public function refresh($compileParts=["tbody"]){
261
+	public function refresh($compileParts=["tbody"]) {
262 262
 		$this->_compileParts=$compileParts;
263 263
 		return $this;
264 264
 	}
265 265
 
266 266
 
267
-	public function addSearchInToolbar($position=Direction::RIGHT){
267
+	public function addSearchInToolbar($position=Direction::RIGHT) {
268 268
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
269 269
 	}
270 270
 
271
-	public function getSearchField(){
272
-		if(isset($this->_searchField)===false){
273
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
274
-			$this->_searchField->addIcon("search",Direction::RIGHT);
271
+	public function getSearchField() {
272
+		if (isset($this->_searchField)===false) {
273
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
274
+			$this->_searchField->addIcon("search", Direction::RIGHT);
275 275
 		}
276 276
 		return $this->_searchField;
277 277
 	}
@@ -287,7 +287,7 @@  discard block
 block discarded – undo
287 287
 		return $this;
288 288
 	}
289 289
 
290
-	public function asForm(){
290
+	public function asForm() {
291 291
 		return $this->getForm();
292 292
 	}
293 293
 
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 
296 296
 	protected function getTargetSelector() {
297 297
 		$result=$this->_targetSelector;
298
-		if(!isset($result))
298
+		if (!isset($result))
299 299
 			$result="#".$this->identifier;
300 300
 		return $result;
301 301
 	}
@@ -311,9 +311,9 @@  discard block
 block discarded – undo
311 311
 	}
312 312
 
313 313
 	protected function getCheckedMessage() {
314
-		$result= $this->_checkedMessage;
315
-		if(!isset($result)){
316
-			$result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"];
314
+		$result=$this->_checkedMessage;
315
+		if (!isset($result)) {
316
+			$result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"];
317 317
 		}
318 318
 		return $result;
319 319
 	}
@@ -333,14 +333,14 @@  discard block
 block discarded – undo
333 333
 	 * @param array $checkedMessage
334 334
 	 * @param callable $callback
335 335
 	 */
336
-	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
337
-		if(isset($checkedMessage))
336
+	public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) {
337
+		if (isset($checkedMessage))
338 338
 			$this->_checkedMessage=$checkedMessage;
339 339
 		$checkedMessage=$this->getCheckedMessage();
340 340
 		$this->_hasCheckboxes=true;
341 341
 		$this->_hasCheckedMessage=true;
342
-		$element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]);
343
-		$this->addInToolbar($element,$callback);
342
+		$element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]);
343
+		$this->addInToolbar($element, $callback);
344 344
 	}
345 345
 
346 346
 
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTableFieldAsTrait.php 1 patch
Spacing   +51 added lines, -51 removed lines patch added patch discarded remove patch
@@ -11,19 +11,19 @@  discard block
 block discarded – undo
11 11
  * @property boolean $_visibleHover
12 12
  * @property InstanceViewer $_instanceViewer
13 13
  */
14
-trait DataTableFieldAsTrait{
14
+trait DataTableFieldAsTrait {
15 15
 	abstract public function addField($field);
16
-	abstract public function insertField($index,$field);
17
-	abstract public function insertInField($index,$field);
18
-	abstract public function fieldAs($index,$type,$attributes=NULL);
16
+	abstract public function insertField($index, $field);
17
+	abstract public function insertInField($index, $field);
18
+	abstract public function fieldAs($index, $type, $attributes=NULL);
19 19
 	/**
20 20
 	 * @param string $caption
21 21
 	 * @param callable $callback
22 22
 	 * @param boolean $visibleHover
23 23
 	 * @return callable
24 24
 	 */
25
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
26
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
25
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
26
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
27 27
 	}
28 28
 
29 29
 	/**
@@ -32,19 +32,19 @@  discard block
 block discarded – undo
32 32
 	 * @param callable $callback
33 33
 	 * @return callable
34 34
 	 */
35
-	private function getCallable($thisCallback,$parameters,$callback=null){
36
-		$result=function($instance) use($thisCallback,$parameters,$callback){
37
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
38
-			if(isset($callback)){
39
-				if(\is_callable($callback)){
40
-					$callback($object,$instance);
35
+	private function getCallable($thisCallback, $parameters, $callback=null) {
36
+		$result=function($instance) use($thisCallback, $parameters, $callback){
37
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
38
+			if (isset($callback)) {
39
+				if (\is_callable($callback)) {
40
+					$callback($object, $instance);
41 41
 				}
42 42
 			}
43
-			if($object instanceof HtmlSemDoubleElement){
44
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
45
-				if($object->propertyContains("class","visibleover")){
43
+			if ($object instanceof HtmlSemDoubleElement) {
44
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
45
+				if ($object->propertyContains("class", "visibleover")) {
46 46
 					$this->_visibleHover=true;
47
-					$object->setProperty("style","visibility:hidden;");
47
+					$object->setProperty("style", "visibility:hidden;");
48 48
 				}
49 49
 			}
50 50
 			return $object;
@@ -56,9 +56,9 @@  discard block
 block discarded – undo
56 56
 	 * @param string $caption
57 57
 	 * @return HtmlButton
58 58
 	 */
59
-	private function getFieldButton($caption,$visibleHover=true){
60
-		$bt= new HtmlButton("",$caption);
61
-		if($visibleHover)
59
+	private function getFieldButton($caption, $visibleHover=true) {
60
+		$bt=new HtmlButton("", $caption);
61
+		if ($visibleHover)
62 62
 			$this->_visibleOver($bt);
63 63
 			return $bt;
64 64
 	}
@@ -72,19 +72,19 @@  discard block
 block discarded – undo
72 72
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
73 73
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
74 74
 	 */
75
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
76
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
77
-			$button=new HtmlButton($id,$value,$cssStyle);
78
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
79
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
75
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
76
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
77
+			$button=new HtmlButton($id, $value, $cssStyle);
78
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
79
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
80 80
 				$this->_visibleOver($button);
81 81
 				return $button;
82
-		}, $index,$attributes);
82
+		}, $index, $attributes);
83 83
 	}
84 84
 
85
-	protected function _visibleOver($element){
85
+	protected function _visibleOver($element) {
86 86
 		$this->_visibleHover=true;
87
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
87
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
88 88
 	}
89 89
 
90 90
 	/**
@@ -94,8 +94,8 @@  discard block
 block discarded – undo
94 94
 	 * @param boolean $visibleHover
95 95
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
96 96
 	 */
97
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
98
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
97
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
98
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
99 99
 		return $this;
100 100
 	}
101 101
 
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
 	 * @param callable $callback
107 107
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
108 108
 	 */
109
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
110
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
109
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
110
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
111 111
 		return $this;
112 112
 	}
113 113
 
@@ -118,25 +118,25 @@  discard block
 block discarded – undo
118 118
 	 * @param callable $callback
119 119
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
120 120
 	 */
121
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
122
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
121
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
122
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
123 123
 		return $this;
124 124
 	}
125 125
 
126
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
127
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
126
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
127
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
128 128
 		return $this;
129 129
 	}
130 130
 
131
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
132
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
131
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
132
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
133 133
 		return $this;
134 134
 	}
135 135
 
136
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
137
-		$bt=$this->getFieldButton("",$visibleHover);
136
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
137
+		$bt=$this->getFieldButton("", $visibleHover);
138 138
 		$bt->asIcon($icon);
139
-		if(isset($class))
139
+		if (isset($class))
140 140
 			$bt->addClass($class);
141 141
 			return $bt;
142 142
 	}
@@ -147,30 +147,30 @@  discard block
 block discarded – undo
147 147
 	 * @param callable $callback
148 148
 	 * @return \Ajax\semantic\widgets\datatable\DataTableFieldAsTrait
149 149
 	 */
150
-	public function addDeleteButton($visibleHover=true,$generateBehavior=true,$callback=null){
150
+	public function addDeleteButton($visibleHover=true, $generateBehavior=true, $callback=null) {
151 151
 		$this->_hasDelete=$generateBehavior;
152
-		return $this->addDefaultButton("remove","delete red basic",$visibleHover,$callback);
152
+		return $this->addDefaultButton("remove", "delete red basic", $visibleHover, $callback);
153 153
 	}
154 154
 
155
-	public function addEditButton($visibleHover=true,$generateBehavior=true,$callback=null){
155
+	public function addEditButton($visibleHover=true, $generateBehavior=true, $callback=null) {
156 156
 		$this->_hasEdit=$generateBehavior;
157
-		return $this->addDefaultButton("edit","edit basic",$visibleHover,$callback);
157
+		return $this->addDefaultButton("edit", "edit basic", $visibleHover, $callback);
158 158
 	}
159 159
 
160
-	public function addEditDeleteButtons($visibleHover=true,$generateBehavior=true,$callbackEdit=null,$callbackDelete=null){
161
-		$this->addEditButton($visibleHover,$generateBehavior,$callbackEdit);
160
+	public function addEditDeleteButtons($visibleHover=true, $generateBehavior=true, $callbackEdit=null, $callbackDelete=null) {
161
+		$this->addEditButton($visibleHover, $generateBehavior, $callbackEdit);
162 162
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
163
-		$this->insertDeleteButtonIn($index,$visibleHover,$generateBehavior,$callbackDelete);
163
+		$this->insertDeleteButtonIn($index, $visibleHover, $generateBehavior, $callbackDelete);
164 164
 		return $this;
165 165
 	}
166 166
 
167
-	public function insertDeleteButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){
167
+	public function insertDeleteButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) {
168 168
 		$this->_hasDelete=$generateBehavior;
169
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$visibleHover,$callback);
169
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $visibleHover, $callback);
170 170
 	}
171 171
 
172
-	public function insertEditButtonIn($index,$visibleHover=true,$generateBehavior=true,$callback=null){
172
+	public function insertEditButtonIn($index, $visibleHover=true, $generateBehavior=true, $callback=null) {
173 173
 		$this->_hasEdit=$generateBehavior;
174
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$visibleHover,$callback);
174
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $visibleHover, $callback);
175 175
 	}
176 176
 }
177 177
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/traits/BaseHtmlPropertiesTrait.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -8,12 +8,12 @@  discard block
 block discarded – undo
8 8
  * @author jc
9 9
  *
10 10
  */
11
-trait BaseHtmlPropertiesTrait{
11
+trait BaseHtmlPropertiesTrait {
12 12
 
13
-	protected $properties=array ();
13
+	protected $properties=array();
14 14
 	abstract protected function ctrl($name, $value, $typeCtrl);
15 15
 	abstract protected function removeOldValues(&$oldValue, $allValues);
16
-	abstract protected function _getElementBy($callback,$elements);
16
+	abstract protected function _getElementBy($callback, $elements);
17 17
 	public function getProperties() {
18 18
 		return $this->properties;
19 19
 	}
@@ -39,13 +39,13 @@  discard block
 block discarded – undo
39 39
 
40 40
 	public function addToProperty($name, $value, $separator=" ") {
41 41
 		if (\is_array($value)) {
42
-			foreach ( $value as $v ) {
42
+			foreach ($value as $v) {
43 43
 				$this->addToProperty($name, $v, $separator);
44 44
 			}
45
-		} else if ($value !== "" && $this->propertyContains($name, $value) === false) {
45
+		} else if ($value!=="" && $this->propertyContains($name, $value)===false) {
46 46
 			$v=@$this->properties[$name];
47
-			if (isset($v) && $v !== "")
48
-				$v=$v . $separator . $value;
47
+			if (isset($v) && $v!=="")
48
+				$v=$v.$separator.$value;
49 49
 				else
50 50
 					$v=$value;
51 51
 
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 	}
84 84
 
85 85
 	public function addToPropertyCtrlCheck($name, $value, $typeCtrl) {
86
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
86
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
87 87
 			return $this->addToProperty($name, $value);
88 88
 		}
89 89
 		return $this;
@@ -104,12 +104,12 @@  discard block
 block discarded – undo
104 104
 	}
105 105
 
106 106
 	protected function setPropertyCtrl($name, $value, $typeCtrl) {
107
-		if ($this->ctrl($name, $value, $typeCtrl) === true)
107
+		if ($this->ctrl($name, $value, $typeCtrl)===true)
108 108
 			return $this->setProperty($name, $value);
109 109
 			return $this;
110 110
 	}
111 111
 
112
-	protected function getElementByPropertyValue($propertyName,$value, $elements) {
113
-		return $this->_getElementBy(function($element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements);
112
+	protected function getElementByPropertyValue($propertyName, $value, $elements) {
113
+		return $this->_getElementBy(function($element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements);
114 114
 	}
115 115
 }
116 116
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/html/BaseHtml.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -15,21 +15,21 @@  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
 
25
-	private function _callSetter($setter,$key,$value,&$array){
25
+	private function _callSetter($setter, $key, $value, &$array) {
26 26
 		$result=false;
27 27
 		if (method_exists($this, $setter) && !JString::startswith($key, "_")) {
28 28
 			try {
29 29
 				$this->$setter($value);
30 30
 				unset($array[$key]);
31 31
 				$result=true;
32
-			} catch ( \Exception $e ) {
32
+			}catch (\Exception $e) {
33 33
 				$result=false;
34 34
 			}
35 35
 		}
@@ -37,17 +37,17 @@  discard block
 block discarded – undo
37 37
 	}
38 38
 
39 39
 	protected function getTemplate(JsUtils $js=NULL) {
40
-		return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js);
40
+		return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js);
41 41
 	}
42 42
 
43 43
 	protected function ctrl($name, $value, $typeCtrl) {
44 44
 		if (\is_array($typeCtrl)) {
45
-			if (array_search($value, $typeCtrl) === false) {
46
-				throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}");
45
+			if (array_search($value, $typeCtrl)===false) {
46
+				throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}");
47 47
 			}
48 48
 		} else {
49 49
 			if (!$typeCtrl($value)) {
50
-				throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name);
50
+				throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name);
51 51
 			}
52 52
 		}
53 53
 		return true;
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 
57 57
 
58 58
 	protected function setMemberCtrl(&$name, $value, $typeCtrl) {
59
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
59
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
60 60
 			return $name=$value;
61 61
 		}
62 62
 		return $this;
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") {
66 66
 		if (\is_array($typeCtrl)) {
67 67
 			$this->removeOldValues($name, $typeCtrl);
68
-			$name.=$separator . $value;
68
+			$name.=$separator.$value;
69 69
 		}
70 70
 		return $this;
71 71
 	}
@@ -73,17 +73,17 @@  discard block
 block discarded – undo
73 73
 
74 74
 
75 75
 	protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") {
76
-		if ($this->ctrl($name, $value, $typeCtrl) === true) {
76
+		if ($this->ctrl($name, $value, $typeCtrl)===true) {
77 77
 			if (\is_array($typeCtrl)) {
78 78
 				$this->removeOldValues($name, $typeCtrl);
79 79
 			}
80
-			$name.=$separator . $value;
80
+			$name.=$separator.$value;
81 81
 		}
82 82
 		return $this;
83 83
 	}
84 84
 
85 85
 	protected function addToMember(&$name, $value, $separator=" ") {
86
-		$name=str_ireplace($value, "", $name) . $separator . $value;
86
+		$name=str_ireplace($value, "", $name).$separator.$value;
87 87
 		return $this;
88 88
 	}
89 89
 
@@ -94,17 +94,17 @@  discard block
 block discarded – undo
94 94
 		$oldValue=trim($oldValue);
95 95
 	}
96 96
 
97
-	protected function _getElementBy($callback,$elements){
97
+	protected function _getElementBy($callback, $elements) {
98 98
 		if (\is_array($elements)) {
99 99
 			$flag=false;
100 100
 			$index=0;
101
-			while ( !$flag && $index < sizeof($elements) ) {
101
+			while (!$flag && $index<sizeof($elements)) {
102 102
 				if ($elements[$index] instanceof BaseHtml)
103 103
 					$flag=($callback($elements[$index]));
104 104
 					$index++;
105 105
 			}
106
-			if ($flag === true)
107
-				return $elements[$index - 1];
106
+			if ($flag===true)
107
+				return $elements[$index-1];
108 108
 		} elseif ($elements instanceof BaseHtml) {
109 109
 			if ($callback($elements))
110 110
 				return $elements;
@@ -139,13 +139,13 @@  discard block
 block discarded – undo
139 139
 	}
140 140
 
141 141
 	public function fromArray($array) {
142
-		foreach ( $this as $key => $value ) {
143
-			if(array_key_exists($key, $array)===true)
144
-				$this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array);
142
+		foreach ($this as $key => $value) {
143
+			if (array_key_exists($key, $array)===true)
144
+				$this->_callSetter("set".ucfirst($key), $key, $array[$key], $array);
145 145
 		}
146
-		foreach ( $array as $key => $value ) {
147
-			if($this->_callSetter($key, $key, $value, $array)===false){
148
-				$this->_callSetter("set" . ucfirst($key), $key, $value, $array);
146
+		foreach ($array as $key => $value) {
147
+			if ($this->_callSetter($key, $key, $value, $array)===false) {
148
+				$this->_callSetter("set".ucfirst($key), $key, $value, $array);
149 149
 			}
150 150
 		}
151 151
 		return $array;
@@ -153,7 +153,7 @@  discard block
 block discarded – undo
153 153
 
154 154
 	public function fromDatabaseObjects($objects, $function) {
155 155
 		if (isset($objects)) {
156
-			foreach ( $objects as $object ) {
156
+			foreach ($objects as $object) {
157 157
 				$this->fromDatabaseObject($object, $function);
158 158
 			}
159 159
 		}
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
 
175 175
 
176 176
 	public function getElementById($identifier, $elements) {
177
-		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements);
177
+		return $this->_getElementBy(function($element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements);
178 178
 	}
179 179
 
180 180
 	public function getBsComponent() {
@@ -188,19 +188,19 @@  discard block
 block discarded – undo
188 188
 
189 189
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
190 190
 		$result=$this->getTemplate($js);
191
-		foreach ( $this as $key => $value ) {
192
-			if (JString::startswith($key, "_") === false && $key !== "events") {
191
+		foreach ($this as $key => $value) {
192
+			if (JString::startswith($key, "_")===false && $key!=="events") {
193 193
 				if (\is_array($value)) {
194 194
 					$v=PropertyWrapper::wrap($value, $js);
195 195
 				} else {
196 196
 					$v=$value;
197 197
 				}
198
-				$result=str_ireplace("%" . $key . "%", $v, $result);
198
+				$result=str_ireplace("%".$key."%", $v, $result);
199 199
 			}
200 200
 		}
201 201
 		if (isset($js)===true) {
202 202
 			$this->run($js);
203
-			if (isset($view) === true) {
203
+			if (isset($view)===true) {
204 204
 				$js->addViewElement($this->identifier, $result, $view);
205 205
 			}
206 206
 		}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/InternalPopup.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -14,64 +14,64 @@
 block discarded – undo
14 14
 	protected $params;
15 15
 	protected $semElement;
16 16
 
17
-	public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){
17
+	public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) {
18 18
 		$this->semElement=$semElement;
19 19
 		$this->title=$title;
20 20
 		$this->content=$content;
21
-		$this->setAttributes($variation,$params);
21
+		$this->setAttributes($variation, $params);
22 22
 	}
23 23
 
24 24
 	public function setHtml($html) {
25
-		$this->html= $html;
25
+		$this->html=$html;
26 26
 		return $this;
27 27
 	}
28 28
 
29
-	public function setAttributes($variation=NULL,$params=array()){
29
+	public function setAttributes($variation=NULL, $params=array()) {
30 30
 		$this->variation=$variation;
31 31
 		$this->params=$params;
32 32
 	}
33 33
 
34
-	public function onShow($jsCode){
34
+	public function onShow($jsCode) {
35 35
 		$this->params["onShow"]=$jsCode;
36 36
 	}
37 37
 
38
-	public function compile(JsUtils $js=NULL){
39
-		if(JString::isNotNull($this->title)){
38
+	public function compile(JsUtils $js=NULL) {
39
+		if (JString::isNotNull($this->title)) {
40 40
 			$this->semElement->addToProperty("data-title", $this->title);
41 41
 		}
42
-		if(JString::isNotNull($this->content)){
42
+		if (JString::isNotNull($this->content)) {
43 43
 			$this->semElement->addToProperty("data-content", $this->content);
44 44
 		}
45 45
 		$this->_compileHtml($js);
46
-		if(JString::isNotNull($this->variation)){
46
+		if (JString::isNotNull($this->variation)) {
47 47
 			$this->semElement->addToProperty("data-variation", $this->variation);
48 48
 		}
49 49
 	}
50 50
 
51
-	private function _compileHtml(JsUtils $js=NULL){
52
-		if(JString::isNotNull($this->html)){
51
+	private function _compileHtml(JsUtils $js=NULL) {
52
+		if (JString::isNotNull($this->html)) {
53 53
 			$html=$this->html;
54
-			if(\is_array($html)){
54
+			if (\is_array($html)) {
55 55
 				\array_walk($html, function(&$item) use($js){
56
-					if($item instanceof HtmlSemDoubleElement){
56
+					if ($item instanceof HtmlSemDoubleElement) {
57 57
 						$comp=$item->compile($js);
58
-						if(isset($js)){
58
+						if (isset($js)) {
59 59
 							$bs=$item->run($js);
60
-							if(isset($bs))
60
+							if (isset($bs))
61 61
 								$this->params['onShow']=$bs->getScript();
62 62
 						}
63 63
 						$item=$comp;
64 64
 					}
65 65
 				});
66
-				$html=\implode("",$html);
66
+				$html=\implode("", $html);
67 67
 			}
68 68
 			$html=\str_replace("\"", "'", $html);
69 69
 			$this->semElement->addToProperty("data-html", $html);
70 70
 		}
71 71
 	}
72 72
 
73
-	public function run(JsUtils $js){
74
-		$js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params);
73
+	public function run(JsUtils $js) {
74
+		$js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params);
75 75
 	}
76 76
 
77 77
 }
78 78
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Spacing   +81 added lines, -81 removed lines patch added patch discarded remove patch
@@ -17,186 +17,186 @@  discard block
 block discarded – undo
17 17
 
18 18
 	public static $index=0;
19 19
 
20
-	public function __construct($identifier,$instance=NULL,$captions=NULL){
20
+	public function __construct($identifier, $instance=NULL, $captions=NULL) {
21 21
 		$this->widgetIdentifier=$identifier;
22 22
 		$this->values=[];
23 23
 		$this->afterCompile=[];
24
-		if(isset($instance))
24
+		if (isset($instance))
25 25
 			$this->setInstance($instance);
26 26
 		$this->setCaptions($captions);
27 27
 		$this->captionCallback=NULL;
28
-		$this->defaultValueFunction=function($name,$value){return $value;};
28
+		$this->defaultValueFunction=function($name, $value) {return $value; };
29 29
 	}
30 30
 
31
-	public function getValues(){
31
+	public function getValues() {
32 32
 		$values=[];
33 33
 		$index=0;
34 34
 		$count=$this->count();
35
-		while($index<$count){
35
+		while ($index<$count) {
36 36
 			$values[]=$this->getValue($index++);
37 37
 		}
38 38
 		return $values;
39 39
 	}
40 40
 
41
-	public function getIdentifier($index=NULL){
42
-		if(!isset($index))
41
+	public function getIdentifier($index=NULL) {
42
+		if (!isset($index))
43 43
 			$index=self::$index;
44 44
 		$value=$index;
45
-		if(isset($this->values["identifier"]))
46
-			$value=$this->values["identifier"]($index,$this->instance);
45
+		if (isset($this->values["identifier"]))
46
+			$value=$this->values["identifier"]($index, $this->instance);
47 47
 		return $value;
48 48
 	}
49 49
 
50
-	public function getValue($index){
50
+	public function getValue($index) {
51 51
 		$property=$this->properties[$index];
52 52
 		return $this->_getValue($property, $index);
53 53
 	}
54 54
 
55
-	protected function _beforeAddProperty($index,&$field){
55
+	protected function _beforeAddProperty($index, &$field) {
56 56
 
57 57
 	}
58 58
 
59
-	protected function _getDefaultValue($name,$value,$index){
59
+	protected function _getDefaultValue($name, $value, $index) {
60 60
 		$func=$this->defaultValueFunction;
61
-		return $func($name,$value,$index,$this->instance);
61
+		return $func($name, $value, $index, $this->instance);
62 62
 	}
63 63
 
64
-	protected function _getPropertyValue(\ReflectionProperty $property,$index){
64
+	protected function _getPropertyValue(\ReflectionProperty $property, $index) {
65 65
 		$property->setAccessible(true);
66 66
 		$value=$property->getValue($this->instance);
67
-		if(isset($this->values[$index])){
68
-			$value= $this->values[$index]($value,$this->instance,$index);
69
-		}else{
70
-			$value=$this->_getDefaultValue($property->getName(),$value, $index);
67
+		if (isset($this->values[$index])) {
68
+			$value=$this->values[$index]($value, $this->instance, $index);
69
+		} else {
70
+			$value=$this->_getDefaultValue($property->getName(), $value, $index);
71 71
 		}
72 72
 		return $value;
73 73
 	}
74 74
 
75
-	protected function _getValue($property,$index){
75
+	protected function _getValue($property, $index) {
76 76
 		$value=null;
77
-		if($property instanceof \ReflectionProperty){
77
+		if ($property instanceof \ReflectionProperty) {
78 78
 			$value=$this->_getPropertyValue($property, $index);
79
-		}else{
80
-			if(\is_callable($property))
79
+		} else {
80
+			if (\is_callable($property))
81 81
 				$value=$property($this->instance);
82
-			elseif(\is_array($property)){
83
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
82
+			elseif (\is_array($property)) {
83
+				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
84 84
 				$value=\implode("", $values);
85
-			}else{
86
-				if(isset($this->values[$index])){
87
-					$value= $this->values[$index]($property,$this->instance,$index);
88
-				}elseif(isset($this->instance->{$property})){
85
+			} else {
86
+				if (isset($this->values[$index])) {
87
+					$value=$this->values[$index]($property, $this->instance, $index);
88
+				}elseif (isset($this->instance->{$property})) {
89 89
 					$value=$this->instance->{$property};
90 90
 				}
91 91
 			}
92 92
 		}
93
-		if(isset($this->afterCompile[$index])){
94
-			if(\is_callable($this->afterCompile[$index])){
95
-				$this->afterCompile[$index]($value,$this->instance,$index);
93
+		if (isset($this->afterCompile[$index])) {
94
+			if (\is_callable($this->afterCompile[$index])) {
95
+				$this->afterCompile[$index]($value, $this->instance, $index);
96 96
 			}
97 97
 		}
98 98
 		return $value;
99 99
 	}
100 100
 
101
-	public function insertField($index,$field){
102
-		array_splice( $this->visibleProperties, $index, 0, $field );
101
+	public function insertField($index, $field) {
102
+		array_splice($this->visibleProperties, $index, 0, $field);
103 103
 		return $this;
104 104
 	}
105 105
 
106
-	public function insertInField($index,$field){
106
+	public function insertInField($index, $field) {
107 107
 		$vb=$this->visibleProperties;
108
-		if(isset($vb[$index])){
109
-			if(\is_array($vb[$index])){
108
+		if (isset($vb[$index])) {
109
+			if (\is_array($vb[$index])) {
110 110
 				$this->visibleProperties[$index][]=$field;
111
-			}else{
112
-				$this->visibleProperties[$index]=[$vb[$index],$field];
111
+			} else {
112
+				$this->visibleProperties[$index]=[$vb[$index], $field];
113 113
 			}
114
-		}else{
114
+		} else {
115 115
 			return $this->insertField($index, $field);
116 116
 		}
117 117
 		return $this;
118 118
 	}
119 119
 
120
-	public function addField($field){
120
+	public function addField($field) {
121 121
 		$this->visibleProperties[]=$field;
122 122
 		return $this;
123 123
 	}
124 124
 
125
-	public function count(){
125
+	public function count() {
126 126
 		return \sizeof($this->properties);
127 127
 	}
128 128
 
129
-	public function visiblePropertiesCount(){
129
+	public function visiblePropertiesCount() {
130 130
 		return \sizeof($this->visibleProperties);
131 131
 	}
132 132
 
133
-	public function getProperty($index){
133
+	public function getProperty($index) {
134 134
 		return $this->properties[$index];
135 135
 	}
136 136
 
137
-	public function getFieldName($index){
137
+	public function getFieldName($index) {
138 138
 		$property=$this->getProperty($index);
139
-		if($property instanceof \ReflectionProperty){
139
+		if ($property instanceof \ReflectionProperty) {
140 140
 			$result=$property->getName();
141
-		}elseif(\is_callable($property)){
141
+		}elseif (\is_callable($property)) {
142 142
 			$result=$this->visibleProperties[$index];
143
-		}else{
143
+		} else {
144 144
 			$result=$property;
145 145
 		}
146 146
 		return $result;
147 147
 	}
148 148
 
149 149
 
150
-	protected function showableProperty(\ReflectionProperty $rProperty){
151
-		return JString::startswith($rProperty->getName(),"_")===false;
150
+	protected function showableProperty(\ReflectionProperty $rProperty) {
151
+		return JString::startswith($rProperty->getName(), "_")===false;
152 152
 	}
153 153
 
154 154
 	public function setInstance($instance) {
155
-		if(\is_string($instance)){
155
+		if (\is_string($instance)) {
156 156
 			$instance=new $instance();
157 157
 		}
158 158
 		$this->instance=$instance;
159 159
 		$this->properties=[];
160 160
 		$this->reflect=new \ReflectionClass($instance);
161
-		if(\sizeof($this->visibleProperties)===0){
161
+		if (\sizeof($this->visibleProperties)===0) {
162 162
 			$this->properties=$this->getDefaultProperties();
163
-		}else{
164
-			foreach ($this->visibleProperties as $property){
163
+		} else {
164
+			foreach ($this->visibleProperties as $property) {
165 165
 				$this->setInstanceProperty($property);
166 166
 			}
167 167
 		}
168 168
 		return $this;
169 169
 	}
170 170
 
171
-	private function setInstanceProperty($property){
172
-		if(\is_callable($property)){
171
+	private function setInstanceProperty($property) {
172
+		if (\is_callable($property)) {
173 173
 			$this->properties[]=$property;
174
-		}elseif(\is_string($property)){
175
-			try{
174
+		}elseif (\is_string($property)) {
175
+			try {
176 176
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
177 177
 				$rProperty=$this->reflect->getProperty($property);
178 178
 				$this->properties[]=$rProperty;
179
-			}catch(\Exception $e){
179
+			}catch (\Exception $e) {
180 180
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
181 181
 				$this->properties[]=$property;
182 182
 			}
183
-		}elseif(\is_int($property)){
183
+		}elseif (\is_int($property)) {
184 184
 			$props=$this->getDefaultProperties();
185
-			if(isset($props[$property]))
185
+			if (isset($props[$property]))
186 186
 				$this->properties[]=$props[$property];
187 187
 				else
188 188
 					$this->properties[]=$property;
189
-		}else{
189
+		} else {
190 190
 			$this->properties[]=$property;
191 191
 		}
192 192
 	}
193 193
 
194
-	protected function getDefaultProperties(){
194
+	protected function getDefaultProperties() {
195 195
 		$result=[];
196 196
 		$properties=$this->reflect->getProperties();
197
-		foreach ($properties as $property){
197
+		foreach ($properties as $property) {
198 198
 			$showable=$this->showableProperty($property);
199
-			if($showable!==false){
199
+			if ($showable!==false) {
200 200
 				$result[]=$property;
201 201
 			}
202 202
 		}
@@ -208,12 +208,12 @@  discard block
 block discarded – undo
208 208
 		return $this;
209 209
 	}
210 210
 
211
-	public function setValueFunction($index,$callback){
211
+	public function setValueFunction($index, $callback) {
212 212
 		$this->values[$index]=$callback;
213 213
 		return $this;
214 214
 	}
215 215
 
216
-	public function setIdentifierFunction($callback){
216
+	public function setIdentifierFunction($callback) {
217 217
 		$this->values["identifier"]=$callback;
218 218
 		return $this;
219 219
 	}
@@ -226,41 +226,41 @@  discard block
 block discarded – undo
226 226
 		return $this->properties;
227 227
 	}
228 228
 
229
-	public function getCaption($index){
230
-		if(isset($this->captions[$index])){
229
+	public function getCaption($index) {
230
+		if (isset($this->captions[$index])) {
231 231
 			return $this->captions[$index];
232 232
 		}
233
-		if($this->properties[$index] instanceof \ReflectionProperty)
233
+		if ($this->properties[$index] instanceof \ReflectionProperty)
234 234
 			return $this->properties[$index]->getName();
235
-		elseif(\is_callable($this->properties[$index]))
235
+		elseif (\is_callable($this->properties[$index]))
236 236
 			return "";
237 237
 		else
238 238
 			return $this->properties[$index];
239 239
 	}
240 240
 
241
-	public function getCaptions(){
242
-		if(isset($this->captions)){
243
-			$captions= $this->captions;
244
-			for($i=\sizeof($captions);$i<$this->count();$i++){
241
+	public function getCaptions() {
242
+		if (isset($this->captions)) {
243
+			$captions=$this->captions;
244
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
245 245
 				$captions[]="";
246 246
 			}
247
-		}else{
247
+		} else {
248 248
 			$captions=[];
249 249
 			$index=0;
250 250
 			$count=$this->count();
251
-			while($index<$count){
251
+			while ($index<$count) {
252 252
 				$captions[]=$this->getCaption($index++);
253 253
 			}
254 254
 		}
255
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
255
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
256 256
 			$callback=$this->captionCallback;
257
-			$callback($captions,$this->instance);
257
+			$callback($captions, $this->instance);
258 258
 		}
259 259
 		return $captions;
260 260
 	}
261 261
 
262
-	public function setCaption($index,$caption){
263
-		if(isset($this->captions)===false)
262
+	public function setCaption($index, $caption) {
263
+		if (isset($this->captions)===false)
264 264
 			$this->captions=[];
265 265
 		$this->captions[$index]=$caption;
266 266
 		return $this;
@@ -278,7 +278,7 @@  discard block
 block discarded – undo
278 278
 	 * @param callable $callback function called after the field compilation
279 279
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
280 280
 	 */
281
-	public function afterCompile($index,$callback){
281
+	public function afterCompile($index, $callback) {
282 282
 		$this->afterCompile[$index]=$callback;
283 283
 		return $this;
284 284
 	}
Please login to merge, or discard this patch.