Completed
Push — master ( 847185...5c7ff3 )
by Jean-Christophe
03:16
created
Ajax/service/JReflection.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 namespace Ajax\service;
4 4
 
5 5
 class JReflection {
6
-	public static function shortClassName($object){
7
-		$classNameWithNamespace = get_class($object);
6
+	public static function shortClassName($object) {
7
+		$classNameWithNamespace=get_class($object);
8 8
 		return substr($classNameWithNamespace, strrpos($classNameWithNamespace, '\\')+1);
9 9
 	}
10 10
 }
11 11
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/php/ci/JsUtils.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,39 +1,39 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\php\ci;
3 3
 
4
-class JsUtils extends \Ajax\JsUtils{
4
+class JsUtils extends \Ajax\JsUtils {
5 5
 	protected $ci;
6
-	protected $_my_controller_paths= array();
7
-	protected $_my_controllers= array();
6
+	protected $_my_controller_paths=array();
7
+	protected $_my_controllers=array();
8 8
 
9
-	public function __construct($params=array(),$injected=NULL){
10
-		parent::__construct($params,$injected);
11
-		$this->_my_controller_paths = array(APPPATH);
9
+	public function __construct($params=array(), $injected=NULL) {
10
+		parent::__construct($params, $injected);
11
+		$this->_my_controller_paths=array(APPPATH);
12 12
 	}
13
-	public function getUrl($url){
13
+	public function getUrl($url) {
14 14
 		return site_url($url);
15 15
 	}
16 16
 
17
-	public function getCi(){
18
-		if(isset($this->ci)===false){
19
-			$this->ci =& get_instance();
17
+	public function getCi() {
18
+		if (isset($this->ci)===false) {
19
+			$this->ci=& get_instance();
20 20
 			$this->ci->load->helper('url');
21 21
 		}
22 22
 		return $this->ci;
23 23
 	}
24 24
 
25
-	public function addViewElement($identifier,$content,&$view){
26
-		if(\array_key_exists("q", $view)===false){
25
+	public function addViewElement($identifier, $content, &$view) {
26
+		if (\array_key_exists("q", $view)===false) {
27 27
 			$view["q"]=array();
28 28
 		}
29 29
 		$view["q"][$identifier]=$content;
30 30
 	}
31 31
 
32
-	public function createScriptVariable(&$view,$view_var, $output){
32
+	public function createScriptVariable(&$view, $view_var, $output) {
33 33
 		$view[$view_var]=$output;
34 34
 	}
35 35
 
36
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
36
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
37 37
 		$ci=$this->getCi();
38 38
 		$controllerName=strtolower($controllerName);
39 39
 		$this->controller($controllerName);
@@ -44,64 +44,64 @@  discard block
 block discarded – undo
44 44
 		return $result;
45 45
 	}
46 46
 
47
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
47
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
48 48
 		return $initialControllerInstance->load->view($viewName, $params, true);
49 49
 	}
50 50
 
51
-	public function fromDispatcher($dispatcher){
51
+	public function fromDispatcher($dispatcher) {
52 52
 		return array_values($dispatcher->uri->segment_array());
53 53
 	}
54 54
 
55
-	public function controller($controller, $name = '', $db_conn = FALSE){
56
-		if (\is_array($controller)){
57
-			foreach ($controller as $babe){
55
+	public function controller($controller, $name='', $db_conn=FALSE) {
56
+		if (\is_array($controller)) {
57
+			foreach ($controller as $babe) {
58 58
 				$this->controller($babe);
59 59
 			}
60 60
 			return;
61 61
 		}
62
-		if ($controller == ''){
62
+		if ($controller=='') {
63 63
 			return;
64 64
 		}
65
-		$path = '';
65
+		$path='';
66 66
 		// Is the controller in a sub-folder? If so, parse out the filename and path.
67
-		if (($last_slash = strrpos($controller, '/')) !== FALSE){
67
+		if (($last_slash=strrpos($controller, '/'))!==FALSE) {
68 68
 			// The path is in front of the last slash
69
-			$path = substr($controller, 0, $last_slash + 1);
69
+			$path=substr($controller, 0, $last_slash+1);
70 70
 			// And the controller name behind it
71
-			$controller = substr($controller, $last_slash + 1);
71
+			$controller=substr($controller, $last_slash+1);
72 72
 		}
73 73
 
74
-		if ($name == ''){
75
-			$name = $controller;
74
+		if ($name=='') {
75
+			$name=$controller;
76 76
 		}
77 77
 
78
-		if (in_array($name, $this->_my_controllers, TRUE)){
78
+		if (in_array($name, $this->_my_controllers, TRUE)) {
79 79
 			return;
80 80
 		}
81 81
 
82
-		$CI =$this->getCi();
83
-		if (isset($CI->$name)){
82
+		$CI=$this->getCi();
83
+		if (isset($CI->$name)) {
84 84
 			show_error('The controller name you are loading is the name of a resource that is already being used: '.$name);
85 85
 		}
86
-		$controller = strtolower($controller);
87
-		foreach ($this->_my_controller_paths as $mod_path){
88
-			if ( ! file_exists($mod_path.'controllers/'.$path.$controller.'.php')){
86
+		$controller=strtolower($controller);
87
+		foreach ($this->_my_controller_paths as $mod_path) {
88
+			if (!file_exists($mod_path.'controllers/'.$path.$controller.'.php')) {
89 89
 				continue;
90 90
 			}
91
-			if ($db_conn !== FALSE && ! class_exists('CI_DB')){
92
-				if ($db_conn === TRUE){
93
-					$db_conn = '';
91
+			if ($db_conn!==FALSE && !class_exists('CI_DB')) {
92
+				if ($db_conn===TRUE) {
93
+					$db_conn='';
94 94
 				}
95 95
 				$CI->load->database($db_conn, FALSE, TRUE);
96 96
 			}
97
-			if ( ! class_exists('CI_Controller')){
97
+			if (!class_exists('CI_Controller')) {
98 98
 				load_class('Controller', 'core');
99 99
 			}
100 100
 			require_once($mod_path.'controllers/'.$path.$controller.'.php');
101
-			$controller = ucfirst($controller);
102
-			$CI->$name = new $controller();
101
+			$controller=ucfirst($controller);
102
+			$CI->$name=new $controller();
103 103
 
104
-			$this->_my_controllers[] = $name;
104
+			$this->_my_controllers[]=$name;
105 105
 			return;
106 106
 		}
107 107
 		show_error('Unable to locate the controller you have specified: '.$controller);
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/FieldAsTrait.php 1 patch
Spacing   +98 added lines, -98 removed lines patch added patch discarded remove patch
@@ -24,23 +24,23 @@  discard block
 block discarded – undo
24 24
  * @property boolean $_edition
25 25
  * @property mixed _modelInstance
26 26
  */
27
-trait FieldAsTrait{
27
+trait FieldAsTrait {
28 28
 
29
-	abstract protected function _getFieldIdentifier($prefix,$name="");
30
-	abstract public function setValueFunction($index,$callback);
29
+	abstract protected function _getFieldIdentifier($prefix, $name="");
30
+	abstract public function setValueFunction($index, $callback);
31 31
 	abstract protected function _getFieldName($index);
32 32
 	abstract protected function _getFieldCaption($index);
33
-	abstract protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL);
33
+	abstract protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL);
34 34
 
35 35
 	/**
36 36
 	 * @param HtmlFormField $element
37 37
 	 * @param array $attributes
38 38
 	 */
39
-	protected function _applyAttributes($element,&$attributes,$index){
40
-		if(isset($attributes["callback"])){
39
+	protected function _applyAttributes($element, &$attributes, $index) {
40
+		if (isset($attributes["callback"])) {
41 41
 			$callback=$attributes["callback"];
42
-			if(\is_callable($callback)){
43
-				$callback($element,$this->_modelInstance,$index);
42
+			if (\is_callable($callback)) {
43
+				$callback($element, $this->_modelInstance, $index);
44 44
 				unset($attributes["callback"]);
45 45
 			}
46 46
 		}
@@ -50,42 +50,42 @@  discard block
 block discarded – undo
50 50
 		$element->fromArray($attributes);
51 51
 	}
52 52
 
53
-	private function _getLabelField($caption,$icon=NULL){
54
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
53
+	private function _getLabelField($caption, $icon=NULL) {
54
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
55 55
 		return $label;
56 56
 	}
57 57
 
58
-	protected function _addRules($element,&$attributes){
59
-		if(isset($attributes["rules"])){
58
+	protected function _addRules($element, &$attributes) {
59
+		if (isset($attributes["rules"])) {
60 60
 			$rules=$attributes["rules"];
61
-			if(\is_array($rules)){
61
+			if (\is_array($rules)) {
62 62
 				$element->addRules($rules);
63 63
 			}
64
-			else{
64
+			else {
65 65
 				$element->addRule($rules);
66 66
 			}
67 67
 			unset($attributes["rules"]);
68 68
 		}
69 69
 	}
70 70
 
71
-	protected function _prepareFormFields(&$field,$name,&$attributes){
71
+	protected function _prepareFormFields(&$field, $name, &$attributes) {
72 72
 		$field->setName($name);
73 73
 		$this->_addRules($field, $attributes);
74 74
 		return $field;
75 75
 	}
76 76
 
77
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
78
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
77
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
78
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
79 79
 			$caption=$this->_getFieldCaption($index);
80 80
 			$name=$this->_getFieldName($index);
81
-			$id=$this->_getFieldIdentifier($prefix,$name);
82
-			if(isset($attributes["name"])){
81
+			$id=$this->_getFieldIdentifier($prefix, $name);
82
+			if (isset($attributes["name"])) {
83 83
 				$name=$attributes["name"];
84 84
 				unset($attributes["name"]);
85 85
 			}
86
-			$element=$elementCallback($id,$name,$value,$caption);
87
-			if(\is_array($attributes)){
88
-				$this->_applyAttributes($element, $attributes,$index);
86
+			$element=$elementCallback($id, $name, $value, $caption);
87
+			if (\is_array($attributes)) {
88
+				$this->_applyAttributes($element, $attributes, $index);
89 89
 			}
90 90
 			$element->setDisabled(!$this->_edition);
91 91
 			return $element;
@@ -94,160 +94,160 @@  discard block
 block discarded – undo
94 94
 	}
95 95
 
96 96
 
97
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
98
-		$this->setValueFunction($index,function($value) use($label,$attributes){
99
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
97
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
98
+		$this->setValueFunction($index, function($value) use($label, $attributes){
99
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
100 100
 			return $pb;
101 101
 		});
102 102
 			return $this;
103 103
 	}
104 104
 
105
-	public function fieldAsRating($index,$max=5, $icon=""){
106
-		$this->setValueFunction($index,function($value) use($max,$icon){
107
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
105
+	public function fieldAsRating($index, $max=5, $icon="") {
106
+		$this->setValueFunction($index, function($value) use($max, $icon){
107
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
108 108
 			return $rating;
109 109
 		});
110 110
 			return $this;
111 111
 	}
112 112
 
113
-	public function fieldAsLabel($index,$icon=NULL){
114
-		$this->setValueFunction($index,function($caption) use($icon){
115
-			$lbl=$this->_getLabelField($caption,$icon);
113
+	public function fieldAsLabel($index, $icon=NULL) {
114
+		$this->setValueFunction($index, function($caption) use($icon){
115
+			$lbl=$this->_getLabelField($caption, $icon);
116 116
 			return $lbl;
117 117
 		});
118 118
 			return $this;
119 119
 	}
120 120
 
121
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
122
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
123
-			$header=new HtmlHeader($id,$niveau,$value);
124
-			if(isset($icon))
121
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
122
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
123
+			$header=new HtmlHeader($id, $niveau, $value);
124
+			if (isset($icon))
125 125
 				$header->asIcon($icon, $value);
126 126
 			return $header;
127
-		}, $index,$attributes,"header");
127
+		}, $index, $attributes, "header");
128 128
 	}
129 129
 
130 130
 
131
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
132
-		$this->setValueFunction($index,function($img) use($size,$circular){
133
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
131
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
132
+		$this->setValueFunction($index, function($img) use($size, $circular){
133
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
134 134
 			return $image;
135 135
 		});
136 136
 			return $this;
137 137
 	}
138 138
 
139
-	public function fieldAsAvatar($index,$attributes=NULL){
140
-		return $this->_fieldAs(function($id,$name,$value){
141
-			$img=new HtmlImage($id,$value);
139
+	public function fieldAsAvatar($index, $attributes=NULL) {
140
+		return $this->_fieldAs(function($id, $name, $value) {
141
+			$img=new HtmlImage($id, $value);
142 142
 			$img->asAvatar();
143 143
 			return $img;
144
-		}, $index,$attributes,"avatar");
144
+		}, $index, $attributes, "avatar");
145 145
 	}
146 146
 
147
-	public function fieldAsRadio($index,$attributes=NULL){
148
-		return $this->_fieldAs(function($id,$name,$value){
149
-			$input= new HtmlRadio($id,$name,$value,$value);
147
+	public function fieldAsRadio($index, $attributes=NULL) {
148
+		return $this->_fieldAs(function($id, $name, $value) {
149
+			$input=new HtmlRadio($id, $name, $value, $value);
150 150
 			return $input;
151
-		}, $index,$attributes,"radio");
151
+		}, $index, $attributes, "radio");
152 152
 	}
153 153
 
154
-	public function fieldAsRadios($index,$elements=[],$attributes=NULL){
155
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($elements){
156
-			return HtmlFormFields::radios($name,$elements,$caption,$value);
157
-		}, $index,$attributes,"radios");
154
+	public function fieldAsRadios($index, $elements=[], $attributes=NULL) {
155
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($elements){
156
+			return HtmlFormFields::radios($name, $elements, $caption, $value);
157
+		}, $index, $attributes, "radios");
158 158
 	}
159 159
 
160
-	public function fieldAsInput($index,$attributes=NULL){
161
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($attributes){
162
-			$input= new HtmlFormInput($id,$caption,"text",$value);
160
+	public function fieldAsInput($index, $attributes=NULL) {
161
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($attributes){
162
+			$input=new HtmlFormInput($id, $caption, "text", $value);
163 163
 			return $this->_prepareFormFields($input, $name, $attributes);
164
-		}, $index,$attributes,"input");
164
+		}, $index, $attributes, "input");
165 165
 	}
166 166
 
167
-	public function fieldAsTextarea($index,$attributes=NULL){
168
-		return $this->_fieldAs(function($id,$name,$value,$caption){
169
-			$textarea=new HtmlFormTextarea($id,$caption,$value);
167
+	public function fieldAsTextarea($index, $attributes=NULL) {
168
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
169
+			$textarea=new HtmlFormTextarea($id, $caption, $value);
170 170
 			$textarea->setName($name);
171 171
 			return $textarea;
172
-		}, $index,$attributes,"textarea");
172
+		}, $index, $attributes, "textarea");
173 173
 	}
174 174
 
175
-	public function fieldAsHidden($index,$attributes=NULL){
176
-		if(!\is_array($attributes)){
175
+	public function fieldAsHidden($index, $attributes=NULL) {
176
+		if (!\is_array($attributes)) {
177 177
 			$attributes=[];
178 178
 		}
179 179
 		$attributes["imputType"]="hidden";
180
-		return $this->fieldAsInput($index,$attributes);
180
+		return $this->fieldAsInput($index, $attributes);
181 181
 	}
182 182
 
183
-	public function fieldAsCheckbox($index,$attributes=NULL){
184
-		return $this->_fieldAs(function($id,$name,$value,$caption){
185
-			$input=new HtmlFormCheckbox($id,$caption,$this->_instanceViewer->getIdentifier());
183
+	public function fieldAsCheckbox($index, $attributes=NULL) {
184
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
185
+			$input=new HtmlFormCheckbox($id, $caption, $this->_instanceViewer->getIdentifier());
186 186
 			$input->setChecked(JString::isBooleanTrue($value));
187 187
 			$input->setName($name);
188 188
 			return $input;
189
-		}, $index,$attributes,"ck");
189
+		}, $index, $attributes, "ck");
190 190
 	}
191 191
 
192
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
193
-		return $this->_fieldAs(function($id,$name,$value,$caption) use($elements,$multiple){
194
-			$dd=new HtmlFormDropdown($id,$elements,$caption,$value);
195
-			$dd->asSelect($name,$multiple);
192
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
193
+		return $this->_fieldAs(function($id, $name, $value, $caption) use($elements, $multiple){
194
+			$dd=new HtmlFormDropdown($id, $elements, $caption, $value);
195
+			$dd->asSelect($name, $multiple);
196 196
 			return $dd;
197
-		}, $index,$attributes,"dd");
197
+		}, $index, $attributes, "dd");
198 198
 	}
199 199
 
200
-	public function fieldAsMessage($index,$attributes=NULL){
201
-		return $this->_fieldAs(function($id,$name,$value,$caption){
202
-			$mess= new HtmlMessage("message-".$id,$value);
200
+	public function fieldAsMessage($index, $attributes=NULL) {
201
+		return $this->_fieldAs(function($id, $name, $value, $caption) {
202
+			$mess=new HtmlMessage("message-".$id, $value);
203 203
 			$mess->addHeader($caption);
204 204
 			return $mess;
205
-		}, $index,$attributes,"message");
205
+		}, $index, $attributes, "message");
206 206
 	}
207 207
 
208 208
 	/**Change fields type
209 209
 	 * @param array $types an array or associative array $type=>$attribute
210 210
 	 */
211
-	public function fieldsAs(array $types){
211
+	public function fieldsAs(array $types) {
212 212
 		$i=0;
213
-		if(JArray::isAssociative($types)){
214
-			foreach ($types as $type=>$attributes){
215
-				if(\is_int($type))
216
-					$this->fieldAs($i++,$attributes,[]);
213
+		if (JArray::isAssociative($types)) {
214
+			foreach ($types as $type=>$attributes) {
215
+				if (\is_int($type))
216
+					$this->fieldAs($i++, $attributes, []);
217 217
 				else
218
-					$this->fieldAs($i++,$type,$attributes);
218
+					$this->fieldAs($i++, $type, $attributes);
219 219
 			}
220
-		}else{
221
-			foreach ($types as $type){
222
-				$this->fieldAs($i++,$type);
220
+		} else {
221
+			foreach ($types as $type) {
222
+				$this->fieldAs($i++, $type);
223 223
 			}
224 224
 		}
225 225
 	}
226 226
 
227
-	public function fieldAs($index,$type,$attributes=NULL){
227
+	public function fieldAs($index, $type, $attributes=NULL) {
228 228
 		$method="fieldAs".\ucfirst($type);
229
-		if(\method_exists($this, $method)){
230
-			if(!\is_array($attributes)){
229
+		if (\method_exists($this, $method)) {
230
+			if (!\is_array($attributes)) {
231 231
 				$attributes=[$index];
232
-			}else{
232
+			} else {
233 233
 				\array_unshift($attributes, $index);
234 234
 			}
235
-			\call_user_func_array([$this,$method], $attributes);
235
+			\call_user_func_array([$this, $method], $attributes);
236 236
 		}
237 237
 	}
238 238
 
239
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
240
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$attributes){
241
-			$button=new HtmlButton($id,$value,$cssStyle);
242
-			$this->_buttonAsSubmit($button,"click",$url,$responseElement,@$attributes["ajax"]);
239
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
240
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $attributes){
241
+			$button=new HtmlButton($id, $value, $cssStyle);
242
+			$this->_buttonAsSubmit($button, "click", $url, $responseElement, @$attributes["ajax"]);
243 243
 			return $button;
244
-		}, $index,$attributes,"submit");
244
+		}, $index, $attributes, "submit");
245 245
 	}
246 246
 
247
-	public function fieldAsButton($index,$cssStyle=NULL,$attributes=NULL){
248
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($cssStyle){
249
-			$button=new HtmlButton($id,$value,$cssStyle);
247
+	public function fieldAsButton($index, $cssStyle=NULL, $attributes=NULL) {
248
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($cssStyle){
249
+			$button=new HtmlButton($id, $value, $cssStyle);
250 250
 			return $button;
251
-		}, $index,$attributes,"button");
251
+		}, $index, $attributes, "button");
252 252
 	}
253 253
 }
254 254
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/datatable/DataTable.php 1 patch
Spacing   +83 added lines, -83 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
  *
23 23
  */
24 24
 class DataTable extends Widget {
25
-	use TableTrait,DataTableFieldAsTrait;
25
+	use TableTrait, DataTableFieldAsTrait;
26 26
 	protected $_searchField;
27 27
 	protected $_urls;
28 28
 	protected $_pagination;
@@ -36,30 +36,30 @@  discard block
 block discarded – undo
36 36
 	protected $_checkedMessage;
37 37
 	protected $_checkedClass;
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(\is_array($this->_deleteBehavior))
54
-			$this->_generateBehavior("delete",$this->_deleteBehavior, $js);
55
-		if(\is_array($this->_editBehavior))
56
-			$this->_generateBehavior("edit",$this->_editBehavior,$js);
53
+		if (\is_array($this->_deleteBehavior))
54
+			$this->_generateBehavior("delete", $this->_deleteBehavior, $js);
55
+		if (\is_array($this->_editBehavior))
56
+			$this->_generateBehavior("edit", $this->_editBehavior, $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,10 +67,10 @@  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
-			if(isset($this->_checkedClass)){
70
+			if (isset($this->_checkedClass)) {
71 71
 				$checkedMessageCall.="$(this).closest('tr').toggleClass('".$this->_checkedClass."',$(this).prop('checked'));";
72 72
 			}
73
-			$js->exec($checkedMessageFunction,true);
73
+			$js->exec($checkedMessageFunction, true);
74 74
 		}
75 75
 		$js->execOn("change", "#".$this->identifier." [name='selection[]']", "
76 76
 				var \$parentCheckbox=\$('#ck-main-ck-{$this->identifier}'),\$checkbox=\$('#{$this->identifier} [name=\"selection[]\"]'),allChecked=true,allUnchecked=true;
@@ -78,10 +78,10 @@  discard block
 block discarded – undo
78 78
 				if(allChecked) {\$parentCheckbox.checkbox('set checked');}else if(allUnchecked){\$parentCheckbox.checkbox('set unchecked');}else{\$parentCheckbox.checkbox('set indeterminate');};".$checkedMessageCall);
79 79
 	}
80 80
 
81
-	protected function _generateBehavior($op,$params,JsUtils $js){
82
-		if(isset($this->_urls[$op])){
83
-			$params=\array_merge($params,["attr"=>"data-ajax"]);
84
-			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op],$this->getTargetSelector(),$params);
81
+	protected function _generateBehavior($op, $params, JsUtils $js) {
82
+		if (isset($this->_urls[$op])) {
83
+			$params=\array_merge($params, ["attr"=>"data-ajax"]);
84
+			$js->getOnClick("#".$this->identifier." ._".$op, $this->_urls[$op], $this->getTargetSelector(), $params);
85 85
 		}
86 86
 	}
87 87
 
@@ -94,50 +94,50 @@  discard block
 block discarded – undo
94 94
 	}
95 95
 
96 96
 
97
-	public function compile(JsUtils $js=NULL,&$view=NULL){
98
-		if(!$this->_generated){
97
+	public function compile(JsUtils $js=NULL, &$view=NULL) {
98
+		if (!$this->_generated) {
99 99
 			$this->_instanceViewer->setInstance($this->_model);
100 100
 			$captions=$this->_instanceViewer->getCaptions();
101 101
 
102 102
 			$table=$this->content["table"];
103 103
 
104
-			if($this->_hasCheckboxes){
104
+			if ($this->_hasCheckboxes) {
105 105
 				$this->_generateMainCheckbox($captions);
106 106
 			}
107 107
 
108 108
 			$table->setRowCount(0, \sizeof($captions));
109 109
 			$table->setHeaderValues($captions);
110
-			if(isset($this->_compileParts))
110
+			if (isset($this->_compileParts))
111 111
 				$table->setCompileParts($this->_compileParts);
112 112
 
113
-			if(isset($this->_searchField) && isset($js)){
114
-				if(isset($this->_urls["refresh"]))
115
-					$this->_searchField->postOn("change", $this->_urls["refresh"],"{'s':$(this).val()}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
113
+			if (isset($this->_searchField) && isset($js)) {
114
+				if (isset($this->_urls["refresh"]))
115
+					$this->_searchField->postOn("change", $this->_urls["refresh"], "{'s':$(this).val()}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
116 116
 			}
117 117
 
118 118
 			$this->_generateContent($table);
119 119
 
120
-			if($this->_hasCheckboxes && $table->hasPart("thead")){
120
+			if ($this->_hasCheckboxes && $table->hasPart("thead")) {
121 121
 					$table->getHeader()->getCell(0, 0)->addClass("no-sort");
122 122
 			}
123 123
 
124
-			if(isset($this->_pagination) && $this->_pagination->getVisible()){
124
+			if (isset($this->_pagination) && $this->_pagination->getVisible()) {
125 125
 				$this->_generatePagination($table);
126 126
 			}
127
-			if(isset($this->_toolbar)){
127
+			if (isset($this->_toolbar)) {
128 128
 				$this->_setToolbarPosition($table, $captions);
129 129
 			}
130
-			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]);
130
+			$this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]);
131 131
 			$this->_compileForm();
132 132
 			$this->_generated=true;
133 133
 		}
134
-		return parent::compile($js,$view);
134
+		return parent::compile($js, $view);
135 135
 	}
136 136
 
137
-	private function _generateMainCheckbox(&$captions){
138
-		$ck=new HtmlCheckbox("main-ck-".$this->identifier,"");
137
+	private function _generateMainCheckbox(&$captions) {
138
+		$ck=new HtmlCheckbox("main-ck-".$this->identifier, "");
139 139
 		$checkedMessageCall="";
140
-		if($this->_hasCheckedMessage)
140
+		if ($this->_hasCheckedMessage)
141 141
 			$checkedMessageCall="updateChecked();";
142 142
 
143 143
 		$ck->setOnChecked($this->_setAllChecked("true").$checkedMessageCall);
@@ -145,28 +145,28 @@  discard block
 block discarded – undo
145 145
 		\array_unshift($captions, $ck);
146 146
 	}
147 147
 
148
-	private function _setAllChecked($checked){
148
+	private function _setAllChecked($checked) {
149 149
 		$result="$('#".$this->identifier." [name=%quote%selection[]%quote%]').prop('checked',".$checked.");";
150
-		if(isset($this->_checkedClass)){
150
+		if (isset($this->_checkedClass)) {
151 151
 			$result.="$('#".$this->identifier." tr').toggleClass('".$this->_checkedClass."',".$checked.");";
152 152
 		}
153 153
 		return $result;
154 154
 	}
155 155
 
156
-	protected function _generateContent($table){
156
+	protected function _generateContent($table) {
157 157
 		$objects=$this->_modelInstance;
158
-		if(isset($this->_pagination)){
158
+		if (isset($this->_pagination)) {
159 159
 			$objects=$this->_pagination->getObjects($this->_modelInstance);
160 160
 		}
161 161
 		InstanceViewer::setIndex(0);
162 162
 		$table->fromDatabaseObjects($objects, function($instance) use($table){
163 163
 			$this->_instanceViewer->setInstance($instance);
164 164
 			InstanceViewer::$index++;
165
-			$values= $this->_instanceViewer->getValues();
166
-			if($this->_hasCheckboxes){
167
-				$ck=new HtmlCheckbox("ck-".$this->identifier,"");
165
+			$values=$this->_instanceViewer->getValues();
166
+			if ($this->_hasCheckboxes) {
167
+				$ck=new HtmlCheckbox("ck-".$this->identifier, "");
168 168
 				$field=$ck->getField();
169
-				$field->setProperty("value",$this->_instanceViewer->getIdentifier());
169
+				$field->setProperty("value", $this->_instanceViewer->getIdentifier());
170 170
 				$field->setProperty("name", "selection[]");
171 171
 				\array_unshift($values, $ck);
172 172
 			}
@@ -177,37 +177,37 @@  discard block
 block discarded – undo
177 177
 		});
178 178
 	}
179 179
 
180
-	private function _generatePagination($table){
180
+	private function _generatePagination($table) {
181 181
 		$footer=$table->getFooter();
182 182
 		$footer->mergeCol();
183
-		$menu=new HtmlPaginationMenu("pagination-".$this->identifier,$this->_pagination->getPagesNumbers());
183
+		$menu=new HtmlPaginationMenu("pagination-".$this->identifier, $this->_pagination->getPagesNumbers());
184 184
 		$menu->floatRight();
185 185
 		$menu->setActiveItem($this->_pagination->getPage()-1);
186 186
 		$footer->setValues($menu);
187
-		if(isset($this->_urls["refresh"]))
188
-			$menu->postOnClick($this->_urls["refresh"],"{'p':$(this).attr('data-page')}","#".$this->identifier." tbody",["preventDefault"=>false,"jqueryDone"=>"replaceWith"]);
187
+		if (isset($this->_urls["refresh"]))
188
+			$menu->postOnClick($this->_urls["refresh"], "{'p':$(this).attr('data-page')}", "#".$this->identifier." tbody", ["preventDefault"=>false, "jqueryDone"=>"replaceWith"]);
189 189
 	}
190 190
 
191
-	protected function _getFieldName($index){
191
+	protected function _getFieldName($index) {
192 192
 		return parent::_getFieldName($index)."[]";
193 193
 	}
194 194
 
195
-	protected function _getFieldCaption($index){
195
+	protected function _getFieldCaption($index) {
196 196
 		return null;
197 197
 	}
198 198
 
199
-	protected function _setToolbarPosition($table,$captions=NULL){
200
-		switch ($this->_toolbarPosition){
199
+	protected function _setToolbarPosition($table, $captions=NULL) {
200
+		switch ($this->_toolbarPosition) {
201 201
 			case PositionInTable::BEFORETABLE:
202 202
 			case PositionInTable::AFTERTABLE:
203
-				if(isset($this->_compileParts)===false){
203
+				if (isset($this->_compileParts)===false) {
204 204
 					$this->content[$this->_toolbarPosition]=$this->_toolbar;
205 205
 				}
206 206
 				break;
207 207
 			case PositionInTable::HEADER:
208 208
 			case PositionInTable::FOOTER:
209 209
 			case PositionInTable::BODY:
210
-				$this->addToolbarRow($this->_toolbarPosition,$table, $captions);
210
+				$this->addToolbarRow($this->_toolbarPosition, $table, $captions);
211 211
 				break;
212 212
 		}
213 213
 	}
@@ -219,23 +219,23 @@  discard block
 block discarded – undo
219 219
 	 * @param callable $callback function called after the field compilation
220 220
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
221 221
 	 */
222
-	public function afterCompile($index,$callback){
223
-		$this->_instanceViewer->afterCompile($index,$callback);
222
+	public function afterCompile($index, $callback) {
223
+		$this->_instanceViewer->afterCompile($index, $callback);
224 224
 		return $this;
225 225
 	}
226 226
 
227
-	private function addToolbarRow($part,$table,$captions){
227
+	private function addToolbarRow($part, $table, $captions) {
228 228
 		$hasPart=$table->hasPart($part);
229
-		if($hasPart){
229
+		if ($hasPart) {
230 230
 			$row=$table->getPart($part)->addRow(\sizeof($captions));
231
-		}else{
231
+		} else {
232 232
 			$row=$table->getPart($part)->getRow(0);
233 233
 		}
234 234
 		$row->mergeCol();
235 235
 		$row->setValues([$this->_toolbar]);
236 236
 	}
237 237
 
238
-	public function getHtmlComponent(){
238
+	public function getHtmlComponent() {
239 239
 		return $this->content["table"];
240 240
 	}
241 241
 
@@ -249,18 +249,18 @@  discard block
 block discarded – undo
249 249
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
250 250
 	 */
251 251
 	public function setUrls($urls) {
252
-		if(\is_array($urls)){
253
-			$this->_urls["refresh"]=JArray::getValue($urls, "refresh",0);
254
-			$this->_urls["edit"]=JArray::getValue($urls, "edit",1);
255
-			$this->_urls["delete"]=JArray::getValue($urls, "delete",2);
256
-		}else{
257
-			$this->_urls=["refresh"=>$urls,"edit"=>$urls,"delete"=>$urls];
252
+		if (\is_array($urls)) {
253
+			$this->_urls["refresh"]=JArray::getValue($urls, "refresh", 0);
254
+			$this->_urls["edit"]=JArray::getValue($urls, "edit", 1);
255
+			$this->_urls["delete"]=JArray::getValue($urls, "delete", 2);
256
+		} else {
257
+			$this->_urls=["refresh"=>$urls, "edit"=>$urls, "delete"=>$urls];
258 258
 		}
259 259
 		return $this;
260 260
 	}
261 261
 
262
-	public function paginate($items_per_page=10,$page=1){
263
-		$this->_pagination=new Pagination($items_per_page,4,$page);
262
+	public function paginate($items_per_page=10, $page=1) {
263
+		$this->_pagination=new Pagination($items_per_page, 4, $page);
264 264
 	}
265 265
 
266 266
 	public function getHasCheckboxes() {
@@ -272,20 +272,20 @@  discard block
 block discarded – undo
272 272
 		return $this;
273 273
 	}
274 274
 
275
-	public function refresh($compileParts=["tbody"]){
275
+	public function refresh($compileParts=["tbody"]) {
276 276
 		$this->_compileParts=$compileParts;
277 277
 		return $this;
278 278
 	}
279 279
 
280 280
 
281
-	public function addSearchInToolbar($position=Direction::RIGHT){
281
+	public function addSearchInToolbar($position=Direction::RIGHT) {
282 282
 		return $this->addInToolbar($this->getSearchField())->setPosition($position);
283 283
 	}
284 284
 
285
-	public function getSearchField(){
286
-		if(isset($this->_searchField)===false){
287
-			$this->_searchField=new HtmlInput("search-".$this->identifier,"search","","Search...");
288
-			$this->_searchField->addIcon("search",Direction::RIGHT);
285
+	public function getSearchField() {
286
+		if (isset($this->_searchField)===false) {
287
+			$this->_searchField=new HtmlInput("search-".$this->identifier, "search", "", "Search...");
288
+			$this->_searchField->addIcon("search", Direction::RIGHT);
289 289
 		}
290 290
 		return $this->_searchField;
291 291
 	}
@@ -301,7 +301,7 @@  discard block
 block discarded – undo
301 301
 		return $this;
302 302
 	}
303 303
 
304
-	public function asForm(){
304
+	public function asForm() {
305 305
 		return $this->getForm();
306 306
 	}
307 307
 
@@ -309,7 +309,7 @@  discard block
 block discarded – undo
309 309
 
310 310
 	protected function getTargetSelector() {
311 311
 		$result=$this->_targetSelector;
312
-		if(!isset($result))
312
+		if (!isset($result))
313 313
 			$result="#".$this->identifier;
314 314
 		return $result;
315 315
 	}
@@ -325,9 +325,9 @@  discard block
 block discarded – undo
325 325
 	}
326 326
 
327 327
 	protected function getCheckedMessage() {
328
-		$result= $this->_checkedMessage;
329
-		if(!isset($result)){
330
-			$result=[0=>"none selected",1=>"one item selected","other"=>"{count} items selected"];
328
+		$result=$this->_checkedMessage;
329
+		if (!isset($result)) {
330
+			$result=[0=>"none selected", 1=>"one item selected", "other"=>"{count} items selected"];
331 331
 		}
332 332
 		return $result;
333 333
 	}
@@ -347,14 +347,14 @@  discard block
 block discarded – undo
347 347
 	 * @param array $checkedMessage
348 348
 	 * @param callable $callback
349 349
 	 */
350
-	public function addCountCheckedInToolbar(array $checkedMessage=null,$callback=null){
351
-		if(isset($checkedMessage))
350
+	public function addCountCheckedInToolbar(array $checkedMessage=null, $callback=null) {
351
+		if (isset($checkedMessage))
352 352
 			$this->_checkedMessage=$checkedMessage;
353 353
 		$checkedMessage=$this->getCheckedMessage();
354 354
 		$this->_hasCheckboxes=true;
355 355
 		$this->_hasCheckedMessage=true;
356
-		$element=new HtmlLabel("checked-count-".$this->identifier,$checkedMessage[0]);
357
-		$this->addInToolbar($element,$callback);
356
+		$element=new HtmlLabel("checked-count-".$this->identifier, $checkedMessage[0]);
357
+		$this->addInToolbar($element, $callback);
358 358
 	}
359 359
 
360 360
 	public function setCheckedClass($_checkedClass) {
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
@@ -12,19 +12,19 @@  discard block
 block discarded – undo
12 12
  * @property boolean $_visibleHover
13 13
  * @property InstanceViewer $_instanceViewer
14 14
  */
15
-trait DataTableFieldAsTrait{
15
+trait DataTableFieldAsTrait {
16 16
 	abstract public function addField($field);
17
-	abstract public function insertField($index,$field);
18
-	abstract public function insertInField($index,$field);
19
-	abstract public function fieldAs($index,$type,$attributes=NULL);
17
+	abstract public function insertField($index, $field);
18
+	abstract public function insertInField($index, $field);
19
+	abstract public function fieldAs($index, $type, $attributes=NULL);
20 20
 	/**
21 21
 	 * @param string $caption
22 22
 	 * @param callable $callback
23 23
 	 * @param boolean $visibleHover
24 24
 	 * @return callable
25 25
 	 */
26
-	private function getFieldButtonCallable($caption,$visibleHover=true,$callback=null){
27
-		return $this->getCallable("getFieldButton",[$caption,$visibleHover],$callback);
26
+	private function getFieldButtonCallable($caption, $visibleHover=true, $callback=null) {
27
+		return $this->getCallable("getFieldButton", [$caption, $visibleHover], $callback);
28 28
 	}
29 29
 
30 30
 	/**
@@ -33,19 +33,19 @@  discard block
 block discarded – undo
33 33
 	 * @param callable $callback
34 34
 	 * @return callable
35 35
 	 */
36
-	private function getCallable($thisCallback,$parameters,$callback=null){
37
-		$result=function($instance) use($thisCallback,$parameters,$callback){
38
-			$object=call_user_func_array(array($this,$thisCallback), $parameters);
39
-			if(isset($callback)){
40
-				if(\is_callable($callback)){
41
-					$callback($object,$instance);
36
+	private function getCallable($thisCallback, $parameters, $callback=null) {
37
+		$result=function($instance) use($thisCallback, $parameters, $callback){
38
+			$object=call_user_func_array(array($this, $thisCallback), $parameters);
39
+			if (isset($callback)) {
40
+				if (\is_callable($callback)) {
41
+					$callback($object, $instance);
42 42
 				}
43 43
 			}
44
-			if($object instanceof HtmlSemDoubleElement){
45
-				$object->setProperty("data-ajax",$this->_instanceViewer->getIdentifier());
46
-				if($object->propertyContains("class","visibleover")){
44
+			if ($object instanceof HtmlSemDoubleElement) {
45
+				$object->setProperty("data-ajax", $this->_instanceViewer->getIdentifier());
46
+				if ($object->propertyContains("class", "visibleover")) {
47 47
 					$this->_visibleHover=true;
48
-					$object->setProperty("style","visibility:hidden;");
48
+					$object->setProperty("style", "visibility:hidden;");
49 49
 				}
50 50
 			}
51 51
 			return $object;
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	 * @param string $caption
58 58
 	 * @return HtmlButton
59 59
 	 */
60
-	private function getFieldButton($caption,$visibleHover=true){
61
-		$bt= new HtmlButton("",$caption);
62
-		if($visibleHover)
60
+	private function getFieldButton($caption, $visibleHover=true) {
61
+		$bt=new HtmlButton("", $caption);
62
+		if ($visibleHover)
63 63
 			$this->_visibleOver($bt);
64 64
 			return $bt;
65 65
 	}
@@ -73,19 +73,19 @@  discard block
 block discarded – undo
73 73
 	 * @param array $attributes associative array (<b>ajax</b> key is for ajax post)
74 74
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
75 75
 	 */
76
-	public function fieldAsSubmit($index,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$attributes=NULL){
77
-		return $this->_fieldAs(function($id,$name,$value,$caption) use ($url,$responseElement,$cssStyle,$index,$attributes){
78
-			$button=new HtmlButton($id,$value,$cssStyle);
79
-			$button->postOnClick($url,"$(event.target).closest('tr').find(':input').serialize()",$responseElement,$attributes["ajax"]);
80
-			if(!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
76
+	public function fieldAsSubmit($index, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $attributes=NULL) {
77
+		return $this->_fieldAs(function($id, $name, $value, $caption) use ($url, $responseElement, $cssStyle, $index, $attributes){
78
+			$button=new HtmlButton($id, $value, $cssStyle);
79
+			$button->postOnClick($url, "$(event.target).closest('tr').find(':input').serialize()", $responseElement, $attributes["ajax"]);
80
+			if (!isset($attributes["visibleHover"]) || $attributes["visibleHover"])
81 81
 				$this->_visibleOver($button);
82 82
 				return $button;
83
-		}, $index,$attributes);
83
+		}, $index, $attributes);
84 84
 	}
85 85
 
86
-	protected function _visibleOver($element){
86
+	protected function _visibleOver($element) {
87 87
 		$this->_visibleHover=true;
88
-		return $element->addToProperty("class", "visibleover")->setProperty("style","visibility:hidden;");
88
+		return $element->addToProperty("class", "visibleover")->setProperty("style", "visibility:hidden;");
89 89
 	}
90 90
 
91 91
 	/**
@@ -95,8 +95,8 @@  discard block
 block discarded – undo
95 95
 	 * @param boolean $visibleHover
96 96
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
97 97
 	 */
98
-	public function addFieldButton($caption,$visibleHover=true,$callback=null){
99
-		$this->addField($this->getCallable("getFieldButton",[$caption,$visibleHover],$callback));
98
+	public function addFieldButton($caption, $visibleHover=true, $callback=null) {
99
+		$this->addField($this->getCallable("getFieldButton", [$caption, $visibleHover], $callback));
100 100
 		return $this;
101 101
 	}
102 102
 
@@ -107,8 +107,8 @@  discard block
 block discarded – undo
107 107
 	 * @param callable $callback
108 108
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
109 109
 	 */
110
-	public function insertFieldButton($index,$caption,$visibleHover=true,$callback=null){
111
-		$this->insertField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
110
+	public function insertFieldButton($index, $caption, $visibleHover=true, $callback=null) {
111
+		$this->insertField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
112 112
 		return $this;
113 113
 	}
114 114
 
@@ -119,25 +119,25 @@  discard block
 block discarded – undo
119 119
 	 * @param callable $callback
120 120
 	 * @return \Ajax\semantic\widgets\datatable\DataTable
121 121
 	 */
122
-	public function insertInFieldButton($index,$caption,$visibleHover=true,$callback=null){
123
-		$this->insertInField($index, $this->getFieldButtonCallable($caption,$visibleHover,$callback));
122
+	public function insertInFieldButton($index, $caption, $visibleHover=true, $callback=null) {
123
+		$this->insertInField($index, $this->getFieldButtonCallable($caption, $visibleHover, $callback));
124 124
 		return $this;
125 125
 	}
126 126
 
127
-	private function addDefaultButton($icon,$class=null,$visibleHover=true,$callback=null){
128
-		$this->addField($this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
127
+	private function addDefaultButton($icon, $class=null, $visibleHover=true, $callback=null) {
128
+		$this->addField($this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
129 129
 		return $this;
130 130
 	}
131 131
 
132
-	private function insertDefaultButtonIn($index,$icon,$class=null,$visibleHover=true,$callback=null){
133
-		$this->insertInField($index,$this->getCallable("getDefaultButton",[$icon,$class,$visibleHover],$callback));
132
+	private function insertDefaultButtonIn($index, $icon, $class=null, $visibleHover=true, $callback=null) {
133
+		$this->insertInField($index, $this->getCallable("getDefaultButton", [$icon, $class, $visibleHover], $callback));
134 134
 		return $this;
135 135
 	}
136 136
 
137
-	private function getDefaultButton($icon,$class=null,$visibleHover=true){
138
-		$bt=$this->getFieldButton("",$visibleHover);
137
+	private function getDefaultButton($icon, $class=null, $visibleHover=true) {
138
+		$bt=$this->getFieldButton("", $visibleHover);
139 139
 		$bt->asIcon($icon);
140
-		if(isset($class))
140
+		if (isset($class))
141 141
 			$bt->addClass($class);
142 142
 		return $bt;
143 143
 	}
@@ -148,30 +148,30 @@  discard block
 block discarded – undo
148 148
 	 * @param callable $callback
149 149
 	 * @return DataTable
150 150
 	 */
151
-	public function addDeleteButton($visibleHover=true,$deleteBehavior=[],$callback=null){
151
+	public function addDeleteButton($visibleHover=true, $deleteBehavior=[], $callback=null) {
152 152
 		$this->_deleteBehavior=$deleteBehavior;
153
-		return $this->addDefaultButton("remove","_delete red basic",$visibleHover,$callback);
153
+		return $this->addDefaultButton("remove", "_delete red basic", $visibleHover, $callback);
154 154
 	}
155 155
 
156
-	public function addEditButton($visibleHover=true,$editBehavior=[],$callback=null){
156
+	public function addEditButton($visibleHover=true, $editBehavior=[], $callback=null) {
157 157
 		$this->_editBehavior=$editBehavior;
158
-		return $this->addDefaultButton("edit","_edit basic",$visibleHover,$callback);
158
+		return $this->addDefaultButton("edit", "_edit basic", $visibleHover, $callback);
159 159
 	}
160 160
 
161
-	public function addEditDeleteButtons($visibleHover=true,$behavior=[],$callbackEdit=null,$callbackDelete=null){
162
-		$this->addEditButton($visibleHover,$behavior,$callbackEdit);
161
+	public function addEditDeleteButtons($visibleHover=true, $behavior=[], $callbackEdit=null, $callbackDelete=null) {
162
+		$this->addEditButton($visibleHover, $behavior, $callbackEdit);
163 163
 		$index=$this->_instanceViewer->visiblePropertiesCount()-1;
164
-		$this->insertDeleteButtonIn($index,$visibleHover,$behavior,$callbackDelete);
164
+		$this->insertDeleteButtonIn($index, $visibleHover, $behavior, $callbackDelete);
165 165
 		return $this;
166 166
 	}
167 167
 
168
-	public function insertDeleteButtonIn($index,$visibleHover=true,$deleteBehavior=[],$callback=null){
168
+	public function insertDeleteButtonIn($index, $visibleHover=true, $deleteBehavior=[], $callback=null) {
169 169
 		$this->_deleteBehavior=$deleteBehavior;
170
-		return $this->insertDefaultButtonIn($index,"remove","_delete red basic",$visibleHover,$callback);
170
+		return $this->insertDefaultButtonIn($index, "remove", "_delete red basic", $visibleHover, $callback);
171 171
 	}
172 172
 
173
-	public function insertEditButtonIn($index,$visibleHover=true,$editBehavior=[],$callback=null){
173
+	public function insertEditButtonIn($index, $visibleHover=true, $editBehavior=[], $callback=null) {
174 174
 		$this->_editBehavior=$editBehavior;
175
-		return $this->insertDefaultButtonIn($index,"edit","_edit basic",$visibleHover,$callback);
175
+		return $this->insertDefaultButtonIn($index, "edit", "_edit basic", $visibleHover, $callback);
176 176
 	}
177 177
 }
178 178
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/form/traits/FormTrait.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -12,28 +12,28 @@  discard block
 block discarded – undo
12 12
  * @author jc
13 13
  *
14 14
  */
15
-trait FormTrait{
15
+trait FormTrait {
16 16
 
17 17
 	/**
18 18
 	 * @return HtmlForm
19 19
 	 */
20 20
 	abstract protected function getForm();
21 21
 
22
-	protected function addCompoValidation($compo,$field){
22
+	protected function addCompoValidation($compo, $field) {
23 23
 		$validation=$field->getValidation();
24
-		if(isset($validation)){
24
+		if (isset($validation)) {
25 25
 			$validation->setIdentifier($field->getDataField()->getIdentifier());
26 26
 			$compo->addFieldValidation($validation);
27 27
 		}
28 28
 		return $compo;
29 29
 	}
30 30
 
31
-	protected function _runValidationParams(&$compo,JsUtils $js=NULL){
31
+	protected function _runValidationParams(&$compo, JsUtils $js=NULL) {
32 32
 		$form=$this->getForm();
33 33
 		$params=$form->getValidationParams();
34
-		if(isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall){
34
+		if (isset($params["_ajaxSubmit"]) && $params["_ajaxSubmit"] instanceof AjaxCall) {
35 35
 			$compilation=$params["_ajaxSubmit"]->compile($js);
36
-			$compilation=str_ireplace("\"","%quote%", $compilation);
36
+			$compilation=str_ireplace("\"", "%quote%", $compilation);
37 37
 			$this->onSuccess($compilation);
38 38
 			$form->removeValidationParam("_ajaxSubmit");
39 39
 		}
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 		return $this->getForm()->addToProperty("class", "loading");
47 47
 	}
48 48
 
49
-	public function setAttached($value=true){
49
+	public function setAttached($value=true) {
50 50
 		$form=$this->getForm();
51
-		if($value)
52
-			$form->addToPropertyCtrl("class", "attached", array ("attached" ));
51
+		if ($value)
52
+			$form->addToPropertyCtrl("class", "attached", array("attached"));
53 53
 		return $form;
54 54
 	}
55 55
 
56
-	public function addErrorMessage(){
56
+	public function addErrorMessage() {
57 57
 		return $this->getForm()->addContent((new HtmlMessage(""))->setError());
58 58
 	}
59 59
 
@@ -68,38 +68,38 @@  discard block
 block discarded – undo
68 68
 	 * @param string $responseElement
69 69
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
70 70
 	 */
71
-	public function submitOn($event,$identifier,$url,$responseElement){
71
+	public function submitOn($event, $identifier, $url, $responseElement) {
72 72
 		$form=$this->getForm();
73 73
 		$elem=$form->getElementById($identifier, $form->getContent());
74
-		if(isset($elem)){
75
-			$this->_buttonAsSubmit($elem, $event,$url,$responseElement);
74
+		if (isset($elem)) {
75
+			$this->_buttonAsSubmit($elem, $event, $url, $responseElement);
76 76
 		}
77 77
 		return $form;
78 78
 	}
79 79
 
80
-	public function submitOnClick($identifier,$url,$responseElement){
80
+	public function submitOnClick($identifier, $url, $responseElement) {
81 81
 		return $this->submitOn("click", $identifier, $url, $responseElement);
82 82
 	}
83 83
 
84
-	public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL){
85
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
86
-		return $this->_buttonAsSubmit($bt, "click",$url,$responseElement);
84
+	public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL) {
85
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
86
+		return $this->_buttonAsSubmit($bt, "click", $url, $responseElement);
87 87
 	}
88 88
 
89
-	protected function _buttonAsSubmit(HtmlButton &$button,$event,$url,$responseElement=NULL,$parameters=NULL){
89
+	protected function _buttonAsSubmit(HtmlButton&$button, $event, $url, $responseElement=NULL, $parameters=NULL) {
90 90
 		$form=$this->getForm();
91
-		if(isset($url) && isset($responseElement)){
92
-			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true);
93
-			$params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true];
94
-			if(\is_array($parameters))
95
-				$params=\array_merge($params,$parameters);
91
+		if (isset($url) && isset($responseElement)) {
92
+			$button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true);
93
+			$params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true];
94
+			if (\is_array($parameters))
95
+				$params=\array_merge($params, $parameters);
96 96
 			$form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params));
97 97
 		}
98 98
 		return $button;
99 99
 	}
100 100
 
101
-	public function addReset($identifier,$value,$cssStyle=NULL){
102
-		$bt=$this->getForm()->addButton($identifier, $value,$cssStyle);
101
+	public function addReset($identifier, $value, $cssStyle=NULL) {
102
+		$bt=$this->getForm()->addButton($identifier, $value, $cssStyle);
103 103
 		$bt->setProperty("type", "reset");
104 104
 		return $bt;
105 105
 	}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 * @param string $jsCode
110 110
 	 * @return \Ajax\semantic\html\collections\form\HtmlForm
111 111
 	 */
112
-	public function onValid($jsCode){
112
+	public function onValid($jsCode) {
113 113
 		$form=$this->getForm();
114 114
 		$form->addValidationParam("onValid", "%function(){".$jsCode."}%");
115 115
 		return $form;
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 * @param string $jsCode can use event and fields parameters
121 121
 	 * @return HtmlForm
122 122
 	 */
123
-	public function onSuccess($jsCode){
123
+	public function onSuccess($jsCode) {
124 124
 		$form=$this->getForm();
125 125
 		$form->addValidationParam("onSuccess", "%function(event,fields){console.log(fields);".$jsCode."}%");
126 126
 		return $form;
Please login to merge, or discard this patch.
Ajax/semantic/html/elements/HtmlButtonGroups.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -16,24 +16,24 @@  discard block
 block discarded – undo
16 16
 
17 17
 	public function __construct($identifier, $elements=array(), $asIcons=false) {
18 18
 		parent::__construct($identifier, "div", "ui buttons");
19
-		if ($asIcons === true)
19
+		if ($asIcons===true)
20 20
 			$this->asIcons();
21 21
 		$this->addElements($elements, $asIcons);
22 22
 	}
23
-	protected function createItem($value){
23
+	protected function createItem($value) {
24 24
 		return new HtmlButton("", $value);
25 25
 	}
26 26
 
27 27
 
28 28
 	public function addElement($element, $asIcon=false) {
29 29
 		$item=$this->addItem($element);
30
-		if($asIcon)
30
+		if ($asIcon)
31 31
 			$item->asIcon($element);
32 32
 		return $item;
33 33
 	}
34 34
 
35 35
 	public function addElements($elements, $asIcons=false) {
36
-		foreach ( $elements as $element ) {
36
+		foreach ($elements as $element) {
37 37
 			$this->addElement($element, $asIcons);
38 38
 		}
39 39
 		return $this;
@@ -42,7 +42,7 @@  discard block
 block discarded – undo
42 42
 	public function insertOr($aferIndex=0, $or="or") {
43 43
 		$orElement=new HtmlSemDoubleElement("", "div", "or");
44 44
 		$orElement->setProperty("data-text", $or);
45
-		array_splice($this->content, $aferIndex + 1, 0, array ($orElement ));
45
+		array_splice($this->content, $aferIndex+1, 0, array($orElement));
46 46
 		return $this;
47 47
 	}
48 48
 
@@ -55,8 +55,8 @@  discard block
 block discarded – undo
55 55
 	}
56 56
 
57 57
 	public function asIcons() {
58
-		foreach ( $this->content as $item ) {
59
-			if($item instanceof HtmlButton)
58
+		foreach ($this->content as $item) {
59
+			if ($item instanceof HtmlButton)
60 60
 			$item->asIcon($item->getContent());
61 61
 		}
62 62
 		return $this->addToProperty("class", "icons");
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
90 90
 	 */
91 91
 	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
92
-		foreach ( $this->content as $element ) {
92
+		foreach ($this->content as $element) {
93 93
 			$element->on($event, $jsCode, $stopPropagation, $preventDefault);
94 94
 		}
95 95
 		return $this;
@@ -101,10 +101,10 @@  discard block
 block discarded – undo
101 101
 
102 102
 	public function addClasses($classes=array()) {
103 103
 		$i=0;
104
-		if(!\is_array($classes)){
105
-			$classes=array_fill (0,$this->count(),$classes);
104
+		if (!\is_array($classes)) {
105
+			$classes=array_fill(0, $this->count(), $classes);
106 106
 		}
107
-		foreach ( $this->content as $button ) {
107
+		foreach ($this->content as $button) {
108 108
 			$button->addToProperty("class", $classes[$i++]);
109 109
 		}
110 110
 		return $this;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 		$this->addElement($function($object));
119 119
 	}
120 120
 
121
-	public function run(JsUtils $js){
122
-		$result= parent::run($js);
121
+	public function run(JsUtils $js) {
122
+		$result=parent::run($js);
123 123
 		return $result->setItemSelector(".ui.button");
124 124
 	}
125 125
 }
126 126
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/common/Widget.php 1 patch
Spacing   +69 added lines, -69 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 use Ajax\common\html\BaseWidget;
20 20
 
21 21
 abstract class Widget extends HtmlDoubleElement {
22
-	use FieldAsTrait,FormTrait;
22
+	use FieldAsTrait, FormTrait;
23 23
 
24 24
 	/**
25 25
 	 * @var string classname
@@ -52,12 +52,12 @@  discard block
 block discarded – undo
52 52
 	protected $_generated;
53 53
 
54 54
 
55
-	public function __construct($identifier,$model,$modelInstance=NULL) {
55
+	public function __construct($identifier, $model, $modelInstance=NULL) {
56 56
 		parent::__construct($identifier);
57 57
 		$this->_template="%wrapContentBefore%%content%%wrapContentAfter%";
58 58
 		$this->setModel($model);
59
-		if(isset($modelInstance)){
60
-			if(\is_array($modelInstance)){
59
+		if (isset($modelInstance)) {
60
+			if (\is_array($modelInstance)) {
61 61
 				$modelInstance=\json_decode(\json_encode($modelInstance), FALSE);
62 62
 			}
63 63
 			$this->show($modelInstance);
@@ -65,28 +65,28 @@  discard block
 block discarded – undo
65 65
 		$this->_generated=false;
66 66
 	}
67 67
 
68
-	protected function _init($instanceViewer,$contentKey,$content,$edition){
68
+	protected function _init($instanceViewer, $contentKey, $content, $edition) {
69 69
 		$this->_instanceViewer=$instanceViewer;
70 70
 		$this->content=[$contentKey=>$content];
71 71
 		$this->_toolbarPosition=PositionInTable::BEFORETABLE;
72 72
 		$this->_edition=$edition;
73 73
 	}
74 74
 
75
-	protected function _getFieldIdentifier($prefix,$name=""){
75
+	protected function _getFieldIdentifier($prefix, $name="") {
76 76
 		return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier();
77 77
 	}
78 78
 
79
-	protected function _getFieldName($index){
79
+	protected function _getFieldName($index) {
80 80
 		return $this->_instanceViewer->getFieldName($index);
81 81
 	}
82 82
 
83
-	protected function _getFieldCaption($index){
83
+	protected function _getFieldCaption($index) {
84 84
 		return $this->_instanceViewer->getCaption($index);
85 85
 	}
86 86
 
87
-	abstract protected  function _setToolbarPosition($table,$captions=NULL);
87
+	abstract protected  function _setToolbarPosition($table, $captions=NULL);
88 88
 
89
-	public function show($modelInstance){
89
+	public function show($modelInstance) {
90 90
 		$this->_modelInstance=$modelInstance;
91 91
 	}
92 92
 
@@ -110,56 +110,56 @@  discard block
 block discarded – undo
110 110
 
111 111
 	abstract public function getHtmlComponent();
112 112
 
113
-	public function setAttached($value=true){
113
+	public function setAttached($value=true) {
114 114
 		return $this->getHtmlComponent()->setAttached($value);
115 115
 	}
116 116
 
117
-	public function setColor($color){
117
+	public function setColor($color) {
118 118
 		return $this->getHtmlComponent()->setColor($color);
119 119
 	}
120 120
 
121 121
 
122
-	public function setCaptions($captions){
122
+	public function setCaptions($captions) {
123 123
 		$this->_instanceViewer->setCaptions($captions);
124 124
 		return $this;
125 125
 	}
126 126
 
127
-	public function setFields($fields){
127
+	public function setFields($fields) {
128 128
 		$this->_instanceViewer->setVisibleProperties($fields);
129 129
 		return $this;
130 130
 	}
131 131
 
132
-	public function addField($field){
132
+	public function addField($field) {
133 133
 		$this->_instanceViewer->addField($field);
134 134
 		return $this;
135 135
 	}
136 136
 
137
-	public function addMessage($attributes=NULL,$fieldName="message"){
137
+	public function addMessage($attributes=NULL, $fieldName="message") {
138 138
 		$this->_instanceViewer->addField($fieldName);
139 139
 		$count=$this->_instanceViewer->visiblePropertiesCount();
140
-		return $this->fieldAsMessage($count-1,$attributes);
140
+		return $this->fieldAsMessage($count-1, $attributes);
141 141
 	}
142 142
 
143
-	public function addErrorMessage(){
144
-		return $this->addMessage(["error"=>true],"message");
143
+	public function addErrorMessage() {
144
+		return $this->addMessage(["error"=>true], "message");
145 145
 	}
146 146
 
147
-	public function insertField($index,$field){
147
+	public function insertField($index, $field) {
148 148
 		$this->_instanceViewer->insertField($index, $field);
149 149
 		return $this;
150 150
 	}
151 151
 
152
-	public function insertInField($index,$field){
152
+	public function insertInField($index, $field) {
153 153
 		$this->_instanceViewer->insertInField($index, $field);
154 154
 		return $this;
155 155
 	}
156 156
 
157
-	public function setValueFunction($index,$callback){
157
+	public function setValueFunction($index, $callback) {
158 158
 		$this->_instanceViewer->setValueFunction($index, $callback);
159 159
 		return $this;
160 160
 	}
161 161
 
162
-	public function setIdentifierFunction($callback){
162
+	public function setIdentifierFunction($callback) {
163 163
 		$this->_instanceViewer->setIdentifierFunction($callback);
164 164
 		return $this;
165 165
 	}
@@ -167,8 +167,8 @@  discard block
 block discarded – undo
167 167
 	/**
168 168
 	 * @return \Ajax\semantic\html\collections\menus\HtmlMenu
169 169
 	 */
170
-	public function getToolbar(){
171
-		if(isset($this->_toolbar)===false){
170
+	public function getToolbar() {
171
+		if (isset($this->_toolbar)===false) {
172 172
 			$this->_toolbar=new HtmlMenu("toolbar-".$this->identifier);
173 173
 		}
174 174
 		return $this->_toolbar;
@@ -180,15 +180,15 @@  discard block
 block discarded – undo
180 180
 	 * @param callable $callback function to call on $element
181 181
 	 * @return \Ajax\common\html\HtmlDoubleElement
182 182
 	 */
183
-	public function addInToolbar($element,$callback=NULL){
183
+	public function addInToolbar($element, $callback=NULL) {
184 184
 		$tb=$this->getToolbar();
185
-		if($element instanceof BaseWidget){
186
-			if($element->getIdentifier()===""){
185
+		if ($element instanceof BaseWidget) {
186
+			if ($element->getIdentifier()==="") {
187 187
 				$element->setIdentifier("tb-item-".$this->identifier."-".$tb->count());
188 188
 			}
189 189
 		}
190
-		if(isset($callback)){
191
-			if(\is_callable($callback)){
190
+		if (isset($callback)) {
191
+			if (\is_callable($callback)) {
192 192
 				$callback($element);
193 193
 			}
194 194
 		}
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
201 201
 	 * @param callable $callback function($element)
202 202
 	 * @return \Ajax\common\html\HtmlDoubleElement
203 203
 	 */
204
-	public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){
205
-		$result=$this->addInToolbar($caption,$callback);
206
-		if(isset($icon))
204
+	public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) {
205
+		$result=$this->addInToolbar($caption, $callback);
206
+		if (isset($icon))
207 207
 			$result->addIcon($icon);
208 208
 		return $result;
209 209
 	}
@@ -213,14 +213,14 @@  discard block
 block discarded – undo
213 213
 	 * @param callable $callback function($element)
214 214
 	 * @return \Ajax\common\Widget
215 215
 	 */
216
-	public function addItemsInToolbar(array $items,$callback=NULL){
217
-		if(JArray::isAssociative($items)){
218
-			foreach ($items as $icon=>$item){
219
-				$this->addItemInToolbar($item,$icon,$callback);
216
+	public function addItemsInToolbar(array $items, $callback=NULL) {
217
+		if (JArray::isAssociative($items)) {
218
+			foreach ($items as $icon=>$item) {
219
+				$this->addItemInToolbar($item, $icon, $callback);
220 220
 			}
221
-		}else{
222
-			foreach ($items as $item){
223
-				$this->addItemInToolbar($item,null,$callback);
221
+		} else {
222
+			foreach ($items as $item) {
223
+				$this->addItemInToolbar($item, null, $callback);
224 224
 			}
225 225
 		}
226 226
 		return $this;
@@ -232,12 +232,12 @@  discard block
 block discarded – undo
232 232
 	 * @param callable $callback function($element)
233 233
 	 * @return \Ajax\common\html\HtmlDoubleElement
234 234
 	 */
235
-	public function addDropdownInToolbar($value,$items,$callback=NULL){
235
+	public function addDropdownInToolbar($value, $items, $callback=NULL) {
236 236
 		$dd=$value;
237 237
 		if (\is_string($value)) {
238
-			$dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items);
238
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items);
239 239
 		}
240
-		return $this->addInToolbar($dd,$callback);
240
+		return $this->addInToolbar($dd, $callback);
241 241
 	}
242 242
 
243 243
 	/**
@@ -246,9 +246,9 @@  discard block
 block discarded – undo
246 246
 	 * @param callable $callback function($element)
247 247
 	 * @return \Ajax\common\html\HtmlDoubleElement
248 248
 	 */
249
-	public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){
250
-		$bt=new HtmlButton("bt-".$caption,$caption,$cssStyle);
251
-		return $this->addInToolbar($bt,$callback);
249
+	public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) {
250
+		$bt=new HtmlButton("bt-".$caption, $caption, $cssStyle);
251
+		return $this->addInToolbar($bt, $callback);
252 252
 	}
253 253
 
254 254
 	/**
@@ -257,9 +257,9 @@  discard block
 block discarded – undo
257 257
 	 * @param callable $callback function($element)
258 258
 	 * @return \Ajax\common\html\HtmlDoubleElement
259 259
 	 */
260
-	public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){
261
-		$bts=new HtmlButtonGroups("",$captions,$asIcon);
262
-		return $this->addInToolbar($bts,$callback);
260
+	public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) {
261
+		$bts=new HtmlButtonGroups("", $captions, $asIcon);
262
+		return $this->addInToolbar($bts, $callback);
263 263
 	}
264 264
 
265 265
 	/**
@@ -269,15 +269,15 @@  discard block
 block discarded – undo
269 269
 	 * @param boolean $labeled
270 270
 	 * @return \Ajax\common\html\HtmlDoubleElement
271 271
 	 */
272
-	public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){
273
-		$bt=new HtmlButton("",$caption);
274
-		$bt->addIcon($icon,$before,$labeled);
272
+	public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) {
273
+		$bt=new HtmlButton("", $caption);
274
+		$bt->addIcon($icon, $before, $labeled);
275 275
 		return $this->addInToolbar($bt);
276 276
 	}
277 277
 
278
-	public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){
279
-		$button=new HtmlButton($identifier,$value,$cssStyle);
280
-		$this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters);
278
+	public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) {
279
+		$button=new HtmlButton($identifier, $value, $cssStyle);
280
+		$this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters);
281 281
 		return $this->addInToolbar($button);
282 282
 	}
283 283
 
@@ -307,7 +307,7 @@  discard block
 block discarded – undo
307 307
 	 * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model
308 308
 	 * @return \Ajax\common\Widget
309 309
 	 */
310
-	public function setDefaultValueFunction($defaultValueFunction){
310
+	public function setDefaultValueFunction($defaultValueFunction) {
311 311
 		$this->_instanceViewer->setDefaultValueFunction($defaultValueFunction);
312 312
 		return $this;
313 313
 	}
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 * @param string|boolean $disable
317 317
 	 * @return string
318 318
 	 */
319
-	public function jsDisabled($disable=true){
319
+	public function jsDisabled($disable=true) {
320 320
 		return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");";
321 321
 	}
322 322
 
@@ -325,12 +325,12 @@  discard block
 block discarded – undo
325 325
 	 * @param callable $callback function($element)
326 326
 	 * @return \Ajax\common\html\HtmlDoubleElement
327 327
 	 */
328
-	public function addEditButtonInToolbar($caption,$callback=NULL){
329
-		$bt=new HtmlButton($this->identifier."-editBtn",$caption);
328
+	public function addEditButtonInToolbar($caption, $callback=NULL) {
329
+		$bt=new HtmlButton($this->identifier."-editBtn", $caption);
330 330
 		$bt->setToggle();
331 331
 		$bt->setActive($this->_edition);
332 332
 		$bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')")));
333
-		return $this->addInToolbar($bt,$callback);
333
+		return $this->addInToolbar($bt, $callback);
334 334
 	}
335 335
 
336 336
 	public function setToolbar(HtmlMenu $_toolbar) {
@@ -344,35 +344,35 @@  discard block
 block discarded – undo
344 344
 	}
345 345
 
346 346
 	public function getForm() {
347
-		if(!isset($this->_form)){
347
+		if (!isset($this->_form)) {
348 348
 			$this->_form=new HtmlForm("frm-".$this->identifier);
349 349
 			$this->setEdition(true);
350 350
 		}
351 351
 		return $this->_form;
352 352
 	}
353 353
 
354
-	public function run(JsUtils $js){
354
+	public function run(JsUtils $js) {
355 355
 		$result=parent::run($js);
356
-		if(isset($this->_form)){
356
+		if (isset($this->_form)) {
357 357
 			$result=$this->runForm($js);
358 358
 		}
359 359
 		return $result;
360 360
 	}
361 361
 
362
-	protected function runForm(JsUtils $js){
362
+	protected function runForm(JsUtils $js) {
363 363
 		$fields=$this->getContentInstances(HtmlFormField::class);
364
-		foreach ($fields as $field){
364
+		foreach ($fields as $field) {
365 365
 			$this->_form->addField($field);
366 366
 		}
367 367
 		return $this->_form->run($js);
368 368
 	}
369 369
 
370
-	protected function _compileForm(){
371
-		if(isset($this->_form)){
370
+	protected function _compileForm() {
371
+		if (isset($this->_form)) {
372 372
 			$noValidate="";
373
-			if(\sizeof($this->_form->getValidationParams())>0)
373
+			if (\sizeof($this->_form->getValidationParams())>0)
374 374
 				$noValidate="novalidate";
375
-			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>");
375
+			$this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>");
376 376
 		}
377 377
 	}
378 378
 
Please login to merge, or discard this patch.
Ajax/common/html/HtmlCollection.php 1 patch
Spacing   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -14,44 +14,44 @@  discard block
 block discarded – undo
14 14
  */
15 15
 abstract class HtmlCollection extends HtmlDoubleElement {
16 16
 
17
-	public function __construct($identifier,$tagName="div"){
18
-		parent::__construct($identifier,$tagName);
17
+	public function __construct($identifier, $tagName="div") {
18
+		parent::__construct($identifier, $tagName);
19 19
 		$this->content=array();
20 20
 	}
21 21
 
22
-	public function addItems($items){
23
-		if(JArray::isAssociative($items)){
24
-			foreach ($items as $k=>$v){
25
-				$this->addItem([$k,$v]);
22
+	public function addItems($items) {
23
+		if (JArray::isAssociative($items)) {
24
+			foreach ($items as $k=>$v) {
25
+				$this->addItem([$k, $v]);
26 26
 			}
27
-		}else{
28
-			foreach ($items as $item){
27
+		} else {
28
+			foreach ($items as $item) {
29 29
 				$this->addItem($item);
30 30
 			}
31 31
 		}
32 32
 		return $this;
33 33
 	}
34 34
 
35
-	public function setItems($items){
35
+	public function setItems($items) {
36 36
 		$this->content=$items;
37 37
 		return $this;
38 38
 	}
39 39
 
40
-	public function getItems(){
40
+	public function getItems() {
41 41
 		return $this->content;
42 42
 	}
43 43
 
44
-	protected function getItemToAdd($item){
44
+	protected function getItemToAdd($item) {
45 45
 		$itemO=$item;
46
-		if($this->createCondition($item)===true){
46
+		if ($this->createCondition($item)===true) {
47 47
 			$itemO=$this->createItem($item);
48 48
 		}
49 49
 		return $itemO;
50 50
 	}
51 51
 
52
-	protected function setItemIdentifier($item,$classname,$index){
53
-		if($item instanceof BaseWidget){
54
-			if($item->getIdentifier()===""){
52
+	protected function setItemIdentifier($item, $classname, $index) {
53
+		if ($item instanceof BaseWidget) {
54
+			if ($item->getIdentifier()==="") {
55 55
 				$item->setIdentifier($classname."-".$this->identifier."-".$index);
56 56
 			}
57 57
 		}
@@ -62,15 +62,15 @@  discard block
 block discarded – undo
62 62
 	 * @param HtmlDoubleElement|string|array $item
63 63
 	 * @return \Ajax\common\html\HtmlDoubleElement
64 64
 	 */
65
-	public function addItem($item){
65
+	public function addItem($item) {
66 66
 		$itemO=$this->getItemToAdd($item);
67 67
 		$this->addContent($itemO);
68 68
 		return $itemO;
69 69
 	}
70 70
 
71
-	public function insertItem($item,$position=0){
71
+	public function insertItem($item, $position=0) {
72 72
 		$itemO=$this->getItemToAdd($item);
73
-		\array_splice( $this->content, $position, 0, array($itemO));
73
+		\array_splice($this->content, $position, 0, array($itemO));
74 74
 		return $itemO;
75 75
 	}
76 76
 
@@ -93,11 +93,11 @@  discard block
 block discarded – undo
93 93
 		return $this;
94 94
 	}
95 95
 
96
-	public function removeItem($index){
96
+	public function removeItem($index) {
97 97
 		return array_splice($this->content, $index, 1);
98 98
 	}
99 99
 
100
-	public function count(){
100
+	public function count() {
101 101
 		return \sizeof($this->content);
102 102
 	}
103 103
 
@@ -108,8 +108,8 @@  discard block
 block discarded – undo
108 108
 		return $this->addItem($function($object));
109 109
 	}
110 110
 
111
-	public function apply($callBack){
112
-		foreach ($this->content as $item){
111
+	public function apply($callBack) {
112
+		foreach ($this->content as $item) {
113 113
 			$callBack($item);
114 114
 		}
115 115
 		return $this;
@@ -129,40 +129,40 @@  discard block
 block discarded – undo
129 129
 	 */
130 130
 	abstract protected function createItem($value);
131 131
 
132
-	protected function createCondition($value){
132
+	protected function createCondition($value) {
133 133
 		return \is_object($value)===false;
134 134
 	}
135 135
 
136
-	protected function contentAs($tagName){
137
-		foreach ($this->content as $item){
136
+	protected function contentAs($tagName) {
137
+		foreach ($this->content as $item) {
138 138
 			$item->setTagName($tagName);
139 139
 		}
140 140
 		return $this;
141 141
 	}
142 142
 
143
-	public function setProperties($properties){
143
+	public function setProperties($properties) {
144 144
 		$i=0;
145
-		foreach ($properties as $k=>$v){
145
+		foreach ($properties as $k=>$v) {
146 146
 			$c=$this->content[$i++];
147
-			if(isset($c))
148
-				$c->setProperty($k,$v);
147
+			if (isset($c))
148
+				$c->setProperty($k, $v);
149 149
 			else
150 150
 				return $this;
151 151
 		}
152 152
 		return $this;
153 153
 	}
154 154
 
155
-	public function setPropertyValues($property,$values){
155
+	public function setPropertyValues($property, $values) {
156 156
 		$i=0;
157
-		if(\is_array($values)===false){
158
-			$values=\array_fill(0, $this->count(),$values);
157
+		if (\is_array($values)===false) {
158
+			$values=\array_fill(0, $this->count(), $values);
159 159
 		}
160
-		foreach ($values as $value){
160
+		foreach ($values as $value) {
161 161
 			$c=$this->content[$i++];
162
-			if(isset($c)){
163
-				$c->setProperty($property,$value);
162
+			if (isset($c)) {
163
+				$c->setProperty($property, $value);
164 164
 			}
165
-			else{
165
+			else {
166 166
 				return $this;
167 167
 			}
168 168
 		}
@@ -172,9 +172,9 @@  discard block
 block discarded – undo
172 172
 	public function compile(JsUtils $js=NULL, &$view=NULL) {
173 173
 		$index=0;
174 174
 		$classname=\strtolower(JReflection::shortClassName($this));
175
-		foreach ($this->content as $item){
176
-			$this->setItemIdentifier($item,$classname,$index++);
175
+		foreach ($this->content as $item) {
176
+			$this->setItemIdentifier($item, $classname, $index++);
177 177
 		}
178
-		return parent::compile($js,$view);
178
+		return parent::compile($js, $view);
179 179
 	}
180 180
 }
181 181
\ No newline at end of file
Please login to merge, or discard this patch.