Completed
Push — master ( 3abce3...7abd10 )
by Jean-Christophe
03:33
created
Ajax/semantic/widgets/base/InstanceViewer.php 1 patch
Spacing   +80 added lines, -80 removed lines patch added patch discarded remove patch
@@ -17,180 +17,180 @@  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 _getValue($property,$index){
65
-		if($property instanceof \ReflectionProperty){
64
+	protected function _getValue($property, $index) {
65
+		if ($property instanceof \ReflectionProperty) {
66 66
 			$property->setAccessible(true);
67 67
 			$value=$property->getValue($this->instance);
68
-			if(isset($this->values[$index])){
69
-				$value= $this->values[$index]($value,$this->instance,$index);
70
-			}else{
71
-				$value=$this->_getDefaultValue($property->getName(),$value, $index);
68
+			if (isset($this->values[$index])) {
69
+				$value=$this->values[$index]($value, $this->instance, $index);
70
+			} else {
71
+				$value=$this->_getDefaultValue($property->getName(), $value, $index);
72 72
 			}
73
-		}else{
74
-			if(\is_callable($property))
73
+		} else {
74
+			if (\is_callable($property))
75 75
 				$value=$property($this->instance);
76
-			elseif(\is_array($property)){
77
-				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index);}, $property);
76
+			elseif (\is_array($property)) {
77
+				$values=\array_map(function($v) use ($index){return $this->_getValue($v, $index); }, $property);
78 78
 				$value=\implode("", $values);
79
-			}else{
80
-				if(isset($this->values[$index])){
81
-					$value= $this->values[$index]($property,$this->instance,$index);
82
-				}else{
79
+			} else {
80
+				if (isset($this->values[$index])) {
81
+					$value=$this->values[$index]($property, $this->instance, $index);
82
+				} else {
83 83
 					$value=$property;
84 84
 				}
85 85
 			}
86 86
 		}
87
-		if(isset($this->afterCompile[$index])){
88
-			if(\is_callable($this->afterCompile[$index])){
89
-				$this->afterCompile[$index]($value,$this->instance,$index);
87
+		if (isset($this->afterCompile[$index])) {
88
+			if (\is_callable($this->afterCompile[$index])) {
89
+				$this->afterCompile[$index]($value, $this->instance, $index);
90 90
 			}
91 91
 		}
92 92
 		return $value;
93 93
 	}
94 94
 
95
-	public function insertField($index,$field){
96
-		array_splice( $this->visibleProperties, $index, 0, $field );
95
+	public function insertField($index, $field) {
96
+		array_splice($this->visibleProperties, $index, 0, $field);
97 97
 		return $this;
98 98
 	}
99 99
 
100
-	public function insertInField($index,$field){
100
+	public function insertInField($index, $field) {
101 101
 		$vb=$this->visibleProperties;
102
-		if(isset($vb[$index])){
103
-			if(\is_array($vb[$index])){
102
+		if (isset($vb[$index])) {
103
+			if (\is_array($vb[$index])) {
104 104
 				$this->visibleProperties[$index][]=$field;
105
-			}else{
106
-				$this->visibleProperties[$index]=[$vb[$index],$field];
105
+			} else {
106
+				$this->visibleProperties[$index]=[$vb[$index], $field];
107 107
 			}
108
-		}else{
108
+		} else {
109 109
 			return $this->insertField($index, $field);
110 110
 		}
111 111
 		return $this;
112 112
 	}
113 113
 
114
-	public function addField($field){
114
+	public function addField($field) {
115 115
 		$this->visibleProperties[]=$field;
116 116
 		return $this;
117 117
 	}
118 118
 
119
-	public function count(){
119
+	public function count() {
120 120
 		return \sizeof($this->properties);
121 121
 	}
122 122
 
123
-	public function visiblePropertiesCount(){
123
+	public function visiblePropertiesCount() {
124 124
 		return \sizeof($this->visibleProperties);
125 125
 	}
126 126
 
127
-	public function getProperty($index){
127
+	public function getProperty($index) {
128 128
 		return $this->properties[$index];
129 129
 	}
130 130
 
131
-	public function getFieldName($index){
131
+	public function getFieldName($index) {
132 132
 		$property=$this->getProperty($index);
133
-		if($property instanceof \ReflectionProperty){
133
+		if ($property instanceof \ReflectionProperty) {
134 134
 			$result=$property->getName();
135
-		}elseif(\is_callable($property)){
135
+		}elseif (\is_callable($property)) {
136 136
 			$result=$this->visibleProperties[$index];
137
-		}else{
137
+		} else {
138 138
 			$result=$property;
139 139
 		}
140 140
 		return $result;
141 141
 	}
142 142
 
143 143
 
144
-	protected function showableProperty(\ReflectionProperty $rProperty){
145
-		return JString::startswith($rProperty->getName(),"_")===false;
144
+	protected function showableProperty(\ReflectionProperty $rProperty) {
145
+		return JString::startswith($rProperty->getName(), "_")===false;
146 146
 	}
147 147
 
148 148
 	public function setInstance($instance) {
149
-		if(\is_string($instance)){
149
+		if (\is_string($instance)) {
150 150
 			$instance=new $instance();
151 151
 		}
152 152
 		$this->instance=$instance;
153 153
 		$this->properties=[];
154 154
 		$this->reflect=new \ReflectionClass($instance);
155
-		if(\sizeof($this->visibleProperties)===0){
155
+		if (\sizeof($this->visibleProperties)===0) {
156 156
 			$this->properties=$this->getDefaultProperties();
157
-		}else{
158
-			foreach ($this->visibleProperties as $property){
157
+		} else {
158
+			foreach ($this->visibleProperties as $property) {
159 159
 				$this->setInstanceProperty($property);
160 160
 			}
161 161
 		}
162 162
 		return $this;
163 163
 	}
164 164
 
165
-	private function setInstanceProperty($property){
166
-		if(\is_callable($property)){
165
+	private function setInstanceProperty($property) {
166
+		if (\is_callable($property)) {
167 167
 			$this->properties[]=$property;
168
-		}elseif(\is_string($property)){
169
-			try{
168
+		}elseif (\is_string($property)) {
169
+			try {
170 170
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
171 171
 				$rProperty=$this->reflect->getProperty($property);
172 172
 				$this->properties[]=$rProperty;
173
-			}catch(\Exception $e){
173
+			}catch (\Exception $e) {
174 174
 				$this->_beforeAddProperty(\sizeof($this->properties), $property);
175 175
 				$this->properties[]=$property;
176 176
 			}
177
-		}elseif(\is_int($property)){
177
+		}elseif (\is_int($property)) {
178 178
 			$props=$this->getDefaultProperties();
179
-			if(isset($props[$property]))
179
+			if (isset($props[$property]))
180 180
 				$this->properties[]=$props[$property];
181 181
 				else
182 182
 					$this->properties[]=$property;
183
-		}else{
183
+		} else {
184 184
 			$this->properties[]=$property;
185 185
 		}
186 186
 	}
187 187
 
188
-	protected function getDefaultProperties(){
188
+	protected function getDefaultProperties() {
189 189
 		$result=[];
190 190
 		$properties=$this->reflect->getProperties();
191
-		foreach ($properties as $property){
191
+		foreach ($properties as $property) {
192 192
 			$showable=$this->showableProperty($property);
193
-			if($showable!==false){
193
+			if ($showable!==false) {
194 194
 				$result[]=$property;
195 195
 			}
196 196
 		}
@@ -202,12 +202,12 @@  discard block
 block discarded – undo
202 202
 		return $this;
203 203
 	}
204 204
 
205
-	public function setValueFunction($index,$callback){
205
+	public function setValueFunction($index, $callback) {
206 206
 		$this->values[$index]=$callback;
207 207
 		return $this;
208 208
 	}
209 209
 
210
-	public function setIdentifierFunction($callback){
210
+	public function setIdentifierFunction($callback) {
211 211
 		$this->values["identifier"]=$callback;
212 212
 		return $this;
213 213
 	}
@@ -220,41 +220,41 @@  discard block
 block discarded – undo
220 220
 		return $this->properties;
221 221
 	}
222 222
 
223
-	public function getCaption($index){
224
-		if(isset($this->captions[$index])){
223
+	public function getCaption($index) {
224
+		if (isset($this->captions[$index])) {
225 225
 			return $this->captions[$index];
226 226
 		}
227
-		if($this->properties[$index] instanceof \ReflectionProperty)
227
+		if ($this->properties[$index] instanceof \ReflectionProperty)
228 228
 			return $this->properties[$index]->getName();
229
-		elseif(\is_callable($this->properties[$index]))
229
+		elseif (\is_callable($this->properties[$index]))
230 230
 			return "";
231 231
 		else
232 232
 			return $this->properties[$index];
233 233
 	}
234 234
 
235
-	public function getCaptions(){
236
-		if(isset($this->captions)){
237
-			$captions= $this->captions;
238
-			for($i=\sizeof($captions);$i<$this->count();$i++){
235
+	public function getCaptions() {
236
+		if (isset($this->captions)) {
237
+			$captions=$this->captions;
238
+			for ($i=\sizeof($captions); $i<$this->count(); $i++) {
239 239
 				$captions[]="";
240 240
 			}
241
-		}else{
241
+		} else {
242 242
 			$captions=[];
243 243
 			$index=0;
244 244
 			$count=$this->count();
245
-			while($index<$count){
245
+			while ($index<$count) {
246 246
 				$captions[]=$this->getCaption($index++);
247 247
 			}
248 248
 		}
249
-		if(isset($this->captionCallback) && \is_callable($this->captionCallback)){
249
+		if (isset($this->captionCallback) && \is_callable($this->captionCallback)) {
250 250
 			$callback=$this->captionCallback;
251
-			$callback($captions,$this->instance);
251
+			$callback($captions, $this->instance);
252 252
 		}
253 253
 		return $captions;
254 254
 	}
255 255
 
256
-	public function setCaption($index,$caption){
257
-		if(isset($this->captions)===false)
256
+	public function setCaption($index, $caption) {
257
+		if (isset($this->captions)===false)
258 258
 			$this->captions=[];
259 259
 		$this->captions[$index]=$caption;
260 260
 		return $this;
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 	 * @param callable $callback function called after the field compilation
273 273
 	 * @return \Ajax\semantic\widgets\datatable\InstanceViewer
274 274
 	 */
275
-	public function afterCompile($index,$callback){
275
+	public function afterCompile($index, $callback) {
276 276
 		$this->afterCompile[$index]=$callback;
277 277
 		return $this;
278 278
 	}
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +97 added lines, -97 removed lines patch added patch discarded remove patch
@@ -31,23 +31,23 @@  discard block
 block discarded – undo
31 31
 	protected $_compileParts;
32 32
 	protected $_visibleHover=false;
33 33
 
34
-	public function run(JsUtils $js){
35
-		if($this->_hasCheckboxes && isset($js)){
34
+	public function run(JsUtils $js) {
35
+		if ($this->_hasCheckboxes && isset($js)) {
36 36
 			$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
37 37
 		var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
38 38
 		\$checkbox.each(function() {if($(this).prop('checked')){allUnchecked = false;}else{allChecked = false;}});
39 39
 		if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');}");
40 40
 		}
41
-		if($this->_visibleHover){
42
-			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');",["preventDefault"=>false,"stopPropagation"=>true]);
43
-			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');",["preventDefault"=>false,"stopPropagation"=>true]);
41
+		if ($this->_visibleHover) {
42
+			$js->execOn("mouseover", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'visible');", ["preventDefault"=>false, "stopPropagation"=>true]);
43
+			$js->execOn("mouseout", "#".$this->identifier." tr", "$(event.target).closest('tr').find('.visibleover').css('visibility', 'hidden');", ["preventDefault"=>false, "stopPropagation"=>true]);
44 44
 		}
45 45
 		return parent::run($js);
46 46
 	}
47 47
 
48
-	public function __construct($identifier,$model,$modelInstance=NULL) {
49
-		parent::__construct($identifier, $model,$modelInstance);
50
-		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0,0), false);
48
+	public function __construct($identifier, $model, $modelInstance=NULL) {
49
+		parent::__construct($identifier, $model, $modelInstance);
50
+		$this->_init(new InstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 0), false);
51 51
 	}
52 52
 
53 53
 	/**
@@ -59,62 +59,62 @@  discard block
 block discarded – undo
59 59
 	}
60 60
 
61 61
 
62
-	public function compile(JsUtils $js=NULL,&$view=NULL){
62
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
63 63
 		$this->_instanceViewer->setInstance($this->_model);
64 64
 		$captions=$this->_instanceViewer->getCaptions();
65 65
 
66 66
 		$table=$this->content["table"];
67 67
 
68
-		if($this->_hasCheckboxes){
68
+		if ($this->_hasCheckboxes) {
69 69
 			$this->_generateMainCheckbox($captions);
70 70
 		}
71 71
 
72 72
 		$table->setRowCount(0, \sizeof($captions));
73 73
 		$table->setHeaderValues($captions);
74
-		if(isset($this->_compileParts))
74
+		if (isset($this->_compileParts))
75 75
 			$table->setCompileParts($this->_compileParts);
76
-		if(isset($this->_searchField) && isset($js)){
77
-			$this->_searchField->postOn("change", $this->_urls,"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
76
+		if (isset($this->_searchField) && isset($js)) {
77
+			$this->_searchField->postOn("change", $this->_urls, "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
78 78
 		}
79 79
 
80 80
 		$this->_generateContent($table);
81 81
 
82
-		if($this->_hasCheckboxes && $table->hasPart("thead")){
83
-				$table->getHeader()->getCell(0, 0)->addToProperty("class","no-sort");
82
+		if ($this->_hasCheckboxes && $table->hasPart("thead")) {
83
+				$table->getHeader()->getCell(0, 0)->addToProperty("class", "no-sort");
84 84
 		}
85 85
 
86
-		if(isset($this->_pagination) && $this->_pagination->getVisible()){
86
+		if (isset($this->_pagination) && $this->_pagination->getVisible()) {
87 87
 			$this->_generatePagination($table);
88 88
 		}
89
-		if(isset($this->_toolbar)){
89
+		if (isset($this->_toolbar)) {
90 90
 			$this->_setToolbarPosition($table, $captions);
91 91
 		}
92
-		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
92
+		$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
93 93
 		$this->_compileForm();
94
-		return parent::compile($js,$view);
94
+		return parent::compile($js, $view);
95 95
 	}
96 96
 
97
-	private function _generateMainCheckbox(&$captions){
98
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
97
+	private function _generateMainCheckbox(&$captions) {
98
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
99 99
 		$ck->setOnChecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',true);");
100 100
 		$ck->setOnUnchecked("$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',false);");
101 101
 		\array_unshift($captions, $ck);
102 102
 	}
103 103
 
104
-	protected function _generateContent($table){
104
+	protected function _generateContent($table) {
105 105
 		$objects=$this->_modelInstance;
106
-		if(isset($this->_pagination)){
106
+		if (isset($this->_pagination)) {
107 107
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
108 108
 		}
109 109
 		InstanceViewer::setIndex(0);
110 110
 		$table->fromDatabaseObjects($objects, function($instance) use($table){
111 111
 			$this->_instanceViewer->setInstance($instance);
112 112
 			InstanceViewer::$index++;
113
-			$values= $this->_instanceViewer->getValues();
114
-			if($this->_hasCheckboxes){
115
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
113
+			$values=$this->_instanceViewer->getValues();
114
+			if ($this->_hasCheckboxes) {
115
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
116 116
 				$field=$ck->getField();
117
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
117
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
118 118
 				$field->setProperty("name", "selection[]");
119 119
 				\array_unshift($values, $ck);
120 120
 			}
@@ -125,36 +125,36 @@  discard block
 block discarded – undo
125 125
 		});
126 126
 	}
127 127
 
128
-	private function _generatePagination($table){
128
+	private function _generatePagination($table) {
129 129
 		$footer=$table->getFooter();
130 130
 		$footer->mergeCol();
131
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
131
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
132 132
 		$menu->floatRight();
133 133
 		$menu->setActiveItem($this->_pagination->getPage()-1);
134 134
 		$footer->setValues($menu);
135
-		$menu->postOnClick($this->_urls,"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
135
+		$menu->postOnClick($this->_urls, "{'p':$(this).attr('data-page')}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
136 136
 	}
137 137
 
138
-	protected function _getFieldName($index){
138
+	protected function _getFieldName($index) {
139 139
 		return parent::_getFieldName($index)."[]";
140 140
 	}
141 141
 
142
-	protected function _getFieldCaption($index){
142
+	protected function _getFieldCaption($index) {
143 143
 		return null;
144 144
 	}
145 145
 
146
-	protected function _setToolbarPosition($table,$captions=NULL){
147
-		switch ($this->_toolbarPosition){
146
+	protected function _setToolbarPosition($table, $captions=NULL) {
147
+		switch ($this->_toolbarPosition) {
148 148
 			case PositionInTable::BEFORETABLE:
149 149
 			case PositionInTable::AFTERTABLE:
150
-				if(isset($this->_compileParts)===false){
150
+				if (isset($this->_compileParts)===false) {
151 151
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
152 152
 				}
153 153
 				break;
154 154
 			case PositionInTable::HEADER:
155 155
 			case PositionInTable::FOOTER:
156 156
 			case PositionInTable::BODY:
157
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
157
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
158 158
 				break;
159 159
 		}
160 160
 	}
@@ -166,23 +166,23 @@  discard block
 block discarded – undo
166 166
 	 * @param callable $callback function called after the field compilation
167 167
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
168 168
 	 */
169
-	public function afterCompile($index,$callback){
170
-		$this->_instanceViewer->afterCompile($index,$callback);
169
+	public function afterCompile($index, $callback) {
170
+		$this->_instanceViewer->afterCompile($index, $callback);
171 171
 		return $this;
172 172
 	}
173 173
 
174
-	private function addToolbarRow($part,$table,$captions){
174
+	private function addToolbarRow($part, $table, $captions) {
175 175
 		$hasPart=$table->hasPart($part);
176
-		if($hasPart){
176
+		if ($hasPart) {
177 177
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
178
-		}else{
178
+		} else {
179 179
 			$row=$table->getPart($part)->getRow(0);
180 180
 		}
181 181
 		$row->mergeCol();
182 182
 		$row->setValues([$this->_toolbar]);
183 183
 	}
184 184
 
185
-	public function getHtmlComponent(){
185
+	public function getHtmlComponent() {
186 186
 		return $this->content["table"];
187 187
 	}
188 188
 
@@ -195,8 +195,8 @@  discard block
 block discarded – undo
195 195
 		return $this;
196 196
 	}
197 197
 
198
-	public function paginate($items_per_page=10,$page=1){
199
-		$this->_pagination=new Pagination($items_per_page,4,$page);
198
+	public function paginate($items_per_page=10, $page=1) {
199
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
200 200
 	}
201 201
 
202 202
 	public function getHasCheckboxes() {
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 		return $this;
209 209
 	}
210 210
 
211
-	public function refresh($compileParts=["tbody"]){
211
+	public function refresh($compileParts=["tbody"]) {
212 212
 		$this->_compileParts=$compileParts;
213 213
 		return $this;
214 214
 	}
@@ -218,8 +218,8 @@  discard block
 block discarded – undo
218 218
 	 * @param boolean $visibleHover
219 219
 	 * @return callable
220 220
 	 */
221
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
222
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
221
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
222
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
223 223
 	}
224 224
 
225 225
 	/**
@@ -228,19 +228,19 @@  discard block
 block discarded – undo
228 228
 	 * @param callable $callback
229 229
 	 * @return callable
230 230
 	 */
231
-	private function getCallable($thisCallback,$parameters,$callback=null){
232
-		$result=function($instance) use($thisCallback,$parameters,$callback){
233
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
234
-			if(isset($callback)){
235
-				if(\is_callable($callback)){
236
-					$callback($object,$instance);
231
+	private function getCallable($thisCallback, $parameters, $callback=null) {
232
+		$result=function($instance) use($thisCallback, $parameters, $callback){
233
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
234
+			if (isset($callback)) {
235
+				if (\is_callable($callback)) {
236
+					$callback($object, $instance);
237 237
 				}
238 238
 			}
239
-			if($object instanceof HtmlSemDoubleElement){
240
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
241
-				if($object->propertyContains("class","visibleover")){
239
+			if ($object instanceof HtmlSemDoubleElement) {
240
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
241
+				if ($object->propertyContains("class", "visibleover")) {
242 242
 					$this->_visibleHover=true;
243
-					$object->setProperty("style","visibility:hidden;");
243
+					$object->setProperty("style", "visibility:hidden;");
244 244
 				}
245 245
 			}
246 246
 			return $object;
@@ -252,9 +252,9 @@  discard block
 block discarded – undo
252 252
 	 * @param string $caption
253 253
 	 * @return HtmlButton
254 254
 	 */
255
-	private function getFieldButton($caption,$visibleHover=true){
256
-		$bt= new HtmlButton("",$caption);
257
-		if($visibleHover)
255
+	private function getFieldButton($caption, $visibleHover=true) {
256
+		$bt=new HtmlButton("", $caption);
257
+		if ($visibleHover)
258 258
 			$this->_visibleOver($bt);
259 259
 		return $bt;
260 260
 	}
@@ -266,8 +266,8 @@  discard block
 block discarded – undo
266 266
 	 * @param boolean $visibleHover
267 267
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
268 268
 	 */
269
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
270
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
269
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
270
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
271 271
 		return $this;
272 272
 	}
273 273
 
@@ -278,8 +278,8 @@  discard block
 block discarded – undo
278 278
 	 * @param callable $callback
279 279
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
280 280
 	 */
281
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
282
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
281
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
282
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
283 283
 		return $this;
284 284
 	}
285 285
 
@@ -290,60 +290,60 @@  discard block
 block discarded – undo
290 290
 	 * @param callable $callback
291 291
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
292 292
 	 */
293
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
294
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
293
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
294
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
295 295
 		return $this;
296 296
 	}
297 297
 
298
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
299
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class],$visibleHover,$callback));
298
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
299
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class], $visibleHover, $callback));
300 300
 		return $this;
301 301
 	}
302 302
 
303
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
304
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
303
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
304
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
305 305
 		return $this;
306 306
 	}
307 307
 
308
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
309
-		$bt=$this->getFieldButton("",$visibleHover);
308
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
309
+		$bt=$this->getFieldButton("", $visibleHover);
310 310
 		$bt->asIcon($icon);
311
-		if(isset($class))
311
+		if (isset($class))
312 312
 			$bt->addToProperty("class", $class);
313 313
 		return $bt;
314 314
 	}
315 315
 
316
-	public function addDeleteButton($visibleHover=true,$callback=null){
317
-		return $this->addDefaultButton("remove","delete red basic",$visibleHover,$callback);
316
+	public function addDeleteButton($visibleHover=true, $callback=null) {
317
+		return $this->addDefaultButton("remove", "delete red basic", $visibleHover, $callback);
318 318
 	}
319 319
 
320
-	public function addEditButton($visibleHover=true,$callback=null){
321
-		return $this->addDefaultButton("edit","edit basic",$visibleHover,$callback);
320
+	public function addEditButton($visibleHover=true, $callback=null) {
321
+		return $this->addDefaultButton("edit", "edit basic", $visibleHover, $callback);
322 322
 	}
323 323
 
324
-	public function addEditDeleteButtons($visibleHover=true,$callbackEdit=null,$callbackDelete=null){
325
-		$this->addEditButton($visibleHover,$callbackEdit);
324
+	public function addEditDeleteButtons($visibleHover=true, $callbackEdit=null, $callbackDelete=null) {
325
+		$this->addEditButton($visibleHover, $callbackEdit);
326 326
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
327
-		$this->insertDeleteButtonIn($index,$visibleHover,$callbackDelete);
327
+		$this->insertDeleteButtonIn($index, $visibleHover, $callbackDelete);
328 328
 		return $this;
329 329
 	}
330 330
 
331
-	public function insertDeleteButtonIn($index,$visibleHover=true,$callback=null){
332
-		return $this->insertDefaultButtonIn($index,"remove","delete red basic",$visibleHover,$callback);
331
+	public function insertDeleteButtonIn($index, $visibleHover=true, $callback=null) {
332
+		return $this->insertDefaultButtonIn($index, "remove", "delete red basic", $visibleHover, $callback);
333 333
 	}
334 334
 
335
-	public function insertEditButtonIn($index,$visibleHover=true,$callback=null){
336
-		return $this->insertDefaultButtonIn($index,"edit","edit basic",$visibleHover,$callback);
335
+	public function insertEditButtonIn($index, $visibleHover=true, $callback=null) {
336
+		return $this->insertDefaultButtonIn($index, "edit", "edit basic", $visibleHover, $callback);
337 337
 	}
338 338
 
339
-	public function addSearchInToolbar($position=Direction::RIGHT){
339
+	public function addSearchInToolbar($position=Direction::RIGHT) {
340 340
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
341 341
 	}
342 342
 
343
-	public function getSearchField(){
344
-		if(isset($this->_searchField)===false){
345
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
346
-			$this->_searchField->addIcon("search",Direction::RIGHT);
343
+	public function getSearchField() {
344
+		if (isset($this->_searchField)===false) {
345
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
346
+			$this->_searchField->addIcon("search", Direction::RIGHT);
347 347
 		}
348 348
 		return $this->_searchField;
349 349
 	}
@@ -359,20 +359,20 @@  discard block
 block discarded – undo
359 359
 		return $this;
360 360
 	}
361 361
 
362
-	public function asForm(){
362
+	public function asForm() {
363 363
 		return $this->getForm();
364 364
 	}
365 365
 
366
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
367
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index){
368
-			$button=new HtmlButton($id,$value,$cssStyle);
369
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement);
366
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
367
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index){
368
+			$button=new HtmlButton($id, $value, $cssStyle);
369
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement);
370 370
 			return $this->_visibleOver($button);
371
-		}, $index,$attributes);
371
+		}, $index, $attributes);
372 372
 	}
373 373
 
374
-	protected function _visibleOver($element){
374
+	protected function _visibleOver($element) {
375 375
 		$this->_visibleHover=true;
376
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
376
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
377 377
 	}
378 378
 }
379 379
\ No newline at end of file
Please login to merge, or discard this patch.