Completed
Push — master ( fff9f5...ef609f )
by Jean-Christophe
07:06
created
Ajax/semantic/widgets/business/user/FormLogin.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -10,50 +10,50 @@
 block discarded – undo
10 10
 	 * @param string $identifier
11 11
 	 * @param object $modelInstance
12 12
 	 */
13
-	public function __construct($identifier,$modelInstance=null,$fieldsOrder=[],$fieldsDefinition=[],$fields=[],$captions=[],$separators=[]) {
14
-		parent::__construct($identifier,$modelInstance,$fieldsOrder,$fieldsDefinition,$fields,$captions,$separators);
13
+	public function __construct($identifier, $modelInstance=null, $fieldsOrder=[], $fieldsDefinition=[], $fields=[], $captions=[], $separators=[]) {
14
+		parent::__construct($identifier, $modelInstance, $fieldsOrder, $fieldsDefinition, $fields, $captions, $separators);
15 15
 	}
16 16
 
17
-	protected function getDefaultModelInstance(){
17
+	protected function getDefaultModelInstance() {
18 18
 		return new UserModel();
19 19
 	}
20 20
 
21
-	public static function regular($identifier,$modelInstance=null){
22
-		return new FormLogin($identifier,$modelInstance,
23
-				["message","login","password","remember","forget","submit","error"],
24
-				["message"=>[["icon"=>"sign in"]],"input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"checkbox","link","submit"=>["green fluid"],"message2"=>[["error"=>true]]],
25
-				["Connection","login","password","remember","forget","submit","error"],
26
-				["Please enter login and password to connect","Login","Password","Remember me.","Forgot your password?","Connection"],
27
-				[0,2,4,5,6]);
21
+	public static function regular($identifier, $modelInstance=null) {
22
+		return new FormLogin($identifier, $modelInstance,
23
+				["message", "login", "password", "remember", "forget", "submit", "error"],
24
+				["message"=>[["icon"=>"sign in"]], "input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "checkbox", "link", "submit"=>["green fluid"], "message2"=>[["error"=>true]]],
25
+				["Connection", "login", "password", "remember", "forget", "submit", "error"],
26
+				["Please enter login and password to connect", "Login", "Password", "Remember me.", "Forgot your password?", "Connection"],
27
+				[0, 2, 4, 5, 6]);
28 28
 	}
29 29
 
30
-	public static function smallInline($identifier,$modelInstance=null){
31
-		$result=new FormLogin($identifier,$modelInstance,
32
-				["login","password","submit"],
33
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
34
-				["login","password","submit"],
35
-				["","","Connection"],
30
+	public static function smallInline($identifier, $modelInstance=null) {
31
+		$result=new FormLogin($identifier, $modelInstance,
32
+				["login", "password", "submit"],
33
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
34
+				["login", "password", "submit"],
35
+				["", "", "Connection"],
36 36
 				[2]);
37 37
 			$result->addDividerBefore(0, "Connection");
38 38
 		return $result;
39 39
 	}
40 40
 
41
-	public static function small($identifier,$modelInstance=null){
42
-		$result=new FormLogin($identifier,$modelInstance,
43
-				["login","password","submit"],
44
-				["input0"=>[["rules"=>"empty"]],"input1"=>[["inputType"=>"password","rules"=>"empty"]],"submit"=>["green basic"]],
45
-				["login","password","submit"],
46
-				["Login","Password","Connection"],
47
-				[1,2]);
41
+	public static function small($identifier, $modelInstance=null) {
42
+		$result=new FormLogin($identifier, $modelInstance,
43
+				["login", "password", "submit"],
44
+				["input0"=>[["rules"=>"empty"]], "input1"=>[["inputType"=>"password", "rules"=>"empty"]], "submit"=>["green basic"]],
45
+				["login", "password", "submit"],
46
+				["Login", "Password", "Connection"],
47
+				[1, 2]);
48 48
 		$result->addDividerBefore(0, "Connection");
49 49
 		return $result;
50 50
 	}
51 51
 
52
-	public static function attachedSegment($identifier,$modelInstance=null){
53
-		$result=self::regular($identifier,$modelInstance);
54
-		$result->fieldAsMessage("message",["icon"=>"sign in","attached"=>true]);
55
-		$result->addWrapper("message",null,"<div class='ui attached segment'>");
56
-		$result->addWrapper("error", null,"</div>");
52
+	public static function attachedSegment($identifier, $modelInstance=null) {
53
+		$result=self::regular($identifier, $modelInstance);
54
+		$result->fieldAsMessage("message", ["icon"=>"sign in", "attached"=>true]);
55
+		$result->addWrapper("message", null, "<div class='ui attached segment'>");
56
+		$result->addWrapper("error", null, "</div>");
57 57
 		return $result;
58 58
 	}
59 59
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlNavElement.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 	protected $attr;
22 22
 
23 23
 
24
-	public function __construct($identifier,$tagName){
25
-		parent::__construct($identifier,$tagName);
24
+	public function __construct($identifier, $tagName) {
25
+		parent::__construct($identifier, $tagName);
26 26
 		$this->root="";
27 27
 		$this->attr="data-ajax";
28 28
 	}
@@ -33,11 +33,11 @@  discard block
 block discarded – undo
33 33
 	 * @param string $targetSelector the target of the get
34 34
 	 * @return HtmlNavElement
35 35
 	 */
36
-	public function autoGetOnClick($targetSelector){
37
-		return $this->getOnClick($this->root, $targetSelector,array("attr"=>$this->attr));
36
+	public function autoGetOnClick($targetSelector) {
37
+		return $this->getOnClick($this->root, $targetSelector, array("attr"=>$this->attr));
38 38
 	}
39 39
 
40
-	public function contentAsString(){
40
+	public function contentAsString() {
41 41
 		return implode("", $this->content);
42 42
 	}
43 43
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/base/HtmlBsDoubleElement.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -23,19 +23,19 @@
 block discarded – undo
23 23
 		return $this;
24 24
 	}
25 25
 
26
-	public function addGlyph($glyphicon,$before=true){
26
+	public function addGlyph($glyphicon, $before=true) {
27 27
 		$glyph=new HtmlGlyphicon("");
28 28
 		$glyph->setGlyphicon($glyphicon);
29
-		$this->addContent($glyph,$before);
29
+		$this->addContent($glyph, $before);
30 30
 		return $this;
31 31
 	}
32 32
 
33
-	public function wrapContentWithGlyph($glyphBefore,$glyphAfter=""){
33
+	public function wrapContentWithGlyph($glyphBefore, $glyphAfter="") {
34 34
 		$before=HtmlGlyphicon::getGlyphicon($glyphBefore)."&nbsp;";
35 35
 		$after="";
36
-		if($glyphAfter!==""){
36
+		if ($glyphAfter!=="") {
37 37
 			$after="&nbsp;".HtmlGlyphicon::getGlyphicon($glyphAfter);
38 38
 		}
39
-		return $this->wrapContent($before,$after);
39
+		return $this->wrapContent($before, $after);
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlPanel.php 1 patch
Braces   +6 added lines, -4 removed lines patch added patch discarded remove patch
@@ -89,8 +89,9 @@  discard block
 block discarded – undo
89 89
 	 * @return \Ajax\bootstrap\html\HtmlPanel default : "panel-default"
90 90
 	 */
91 91
 	public function setStyle($cssStyle) {
92
-		if (!PhalconUtils::startsWith($cssStyle, "panel"))
93
-			$cssStyle="panel".$cssStyle;
92
+		if (!PhalconUtils::startsWith($cssStyle, "panel")) {
93
+					$cssStyle="panel".$cssStyle;
94
+		}
94 95
 		return $this->addToPropertyCtrl("class", $cssStyle, CssRef::Styles("panel"));
95 96
 	}
96 97
 
@@ -132,7 +133,8 @@  discard block
 block discarded – undo
132 133
 	 * @return $this default : false
133 134
 	 */
134 135
 	public function show($value) {
135
-		if ($this->_collapsable)
136
-			$this->_showOnStartup=$value;
136
+		if ($this->_collapsable) {
137
+					$this->_showOnStartup=$value;
138
+		}
137 139
 	}
138 140
 }
Please login to merge, or discard this patch.
Ajax/bootstrap/html/content/HtmlTabItem.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -62,15 +62,15 @@
 block discarded – undo
62 62
 	 */
63 63
 	public function setIdentifier($identifier) {
64 64
 		parent::setIdentifier($identifier);
65
-		if($this->content instanceof HtmlLink){
65
+		if ($this->content instanceof HtmlLink) {
66 66
 			$this->content->setIdentifier("link-".$identifier);
67 67
 		}
68 68
 	}
69
-	public function setActive($value=true){
70
-		$this->setProperty("class", ($value)?"active":"");
69
+	public function setActive($value=true) {
70
+		$this->setProperty("class", ($value) ? "active" : "");
71 71
 	}
72 72
 
73
-	public function disable(){
73
+	public function disable() {
74 74
 		$this->setProperty("class", "disabled");
75 75
 	}
76 76
 }
Please login to merge, or discard this patch.
Ajax/php/laravel/JsUtils.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -4,24 +4,24 @@  discard block
 block discarded – undo
4 4
 
5 5
 use Illuminate\Support\Facades\App;
6 6
 
7
-class JsUtils extends \Ajax\JsUtils{
8
-	public function getUrl($url){
7
+class JsUtils extends \Ajax\JsUtils {
8
+	public function getUrl($url) {
9 9
 		return \url($url);
10 10
 	}
11
-	public function addViewElement($identifier,$content,&$view){
11
+	public function addViewElement($identifier, $content, &$view) {
12 12
 		$controls=$view->__get("q");
13
-		if (isset($controls) === false) {
14
-			$controls=array ();
13
+		if (isset($controls)===false) {
14
+			$controls=array();
15 15
 		}
16 16
 		$controls[$identifier]=$content;
17 17
 		$view->__set("q", $controls);
18 18
 	}
19 19
 
20
-	public function createScriptVariable(&$view,$view_var, $output){
21
-		$view->__set($view_var,$output);
20
+	public function createScriptVariable(&$view, $view_var, $output) {
21
+		$view->__set($view_var, $output);
22 22
 	}
23 23
 
24
-	public function forward($initialControllerInstance,$controllerName,$actionName,$params=NULL){
24
+	public function forward($initialControllerInstance, $controllerName, $actionName, $params=NULL) {
25 25
 		\ob_start();
26 26
 		App::make($controllerName)->{$actionName}($params);
27 27
 		$result=\ob_get_contents();
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 		return $result;
30 30
 	}
31 31
 
32
-	public function renderContent($initialControllerInstance,$viewName, $params=NULL) {
33
-		return \view()->make($viewName,$params)->render();
32
+	public function renderContent($initialControllerInstance, $viewName, $params=NULL) {
33
+		return \view()->make($viewName, $params)->render();
34 34
 	}
35 35
 
36
-	public function fromDispatcher($dispatcher){
36
+	public function fromDispatcher($dispatcher) {
37 37
 		return $dispatcher->segments();
38 38
 	}
39 39
 }
Please login to merge, or discard this patch.
Ajax/service/JQueryAjaxEffect.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 namespace Ajax\service;
3 3
 class JQueryAjaxEffect {
4
-	public static function none($responseElement,$jqueryDone="html"){
4
+	public static function none($responseElement, $jqueryDone="html") {
5 5
 		return "\t$({$responseElement}).{$jqueryDone}( data );\n";
6 6
 	}
7 7
 
8
-	public static function fade($responseElement,$jqueryDone="html"){
8
+	public static function fade($responseElement, $jqueryDone="html") {
9 9
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).fadeIn();\n";
10 10
 	}
11 11
 
12
-	public static function slide($responseElement,$jqueryDone="html"){
12
+	public static function slide($responseElement, $jqueryDone="html") {
13 13
 		return "\t$({$responseElement}).hide().{$jqueryDone}( data ).slideDown();\n";
14 14
 	}
15 15
 }
Please login to merge, or discard this patch.
Ajax/common/html/traits/NavElementTrait.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -8,22 +8,22 @@  discard block
 block discarded – undo
8 8
  * @property string $root
9 9
  * @property string $attr
10 10
  */
11
-trait NavElementTrait{
11
+trait NavElementTrait {
12 12
 
13 13
 	abstract public function contentAsString();
14 14
 	/**
15 15
 	 * Generate the jquery script to set the elements to the HtmlNavElement
16 16
 	 * @param JsUtils $jsUtils
17 17
 	 */
18
-	public function jsSetContent(JsUtils $jsUtils){
19
-		$jsUtils->html("#".$this->identifier,str_replace("\"","'", $this->contentAsString()),true);
18
+	public function jsSetContent(JsUtils $jsUtils) {
19
+		$jsUtils->html("#".$this->identifier, str_replace("\"", "'", $this->contentAsString()), true);
20 20
 	}
21 21
 
22 22
 	public function getRoot() {
23 23
 		return $this->root;
24 24
 	}
25 25
 	public function setRoot($root) {
26
-		$this->root = $root;
26
+		$this->root=$root;
27 27
 		return $this;
28 28
 	}
29 29
 	public function getAttr() {
@@ -36,12 +36,12 @@  discard block
 block discarded – undo
36 36
 	 * @return HtmlNavElement
37 37
 	 */
38 38
 	public function setAttr($attr) {
39
-		$this->attr = $attr;
39
+		$this->attr=$attr;
40 40
 		return $this;
41 41
 	}
42 42
 
43 43
 	public function __call($method, $args) {
44
-		if(isset($this->$method) && is_callable($this->$method)) {
44
+		if (isset($this->$method) && is_callable($this->$method)) {
45 45
 			return call_user_func_array(
46 46
 					$this->$method,
47 47
 					$args
@@ -49,5 +49,5 @@  discard block
 block discarded – undo
49 49
 		}
50 50
 	}
51 51
 
52
-	abstract public function fromDispatcher(JsUtils $js,$dispatcher,$startIndex=0);
52
+	abstract public function fromDispatcher(JsUtils $js, $dispatcher, $startIndex=0);
53 53
 }
Please login to merge, or discard this patch.
Ajax/common/traits/JsUtilsActionsTrait.php 3 patches
Spacing   +33 added lines, -33 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
  */
11 11
 trait JsUtilsActionsTrait {
12 12
 
13
-	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
13
+	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true);
14 14
 	/**
15 15
 	 * show or hide with effect
16 16
 	 *
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
 	 * @param boolean $immediatly defers the execution if set to false
22 22
 	 * @return string
23 23
 	 */
24
-	protected function _showHideWithEffect($action,$element='this', $speed='', $callback='', $immediatly=false) {
24
+	protected function _showHideWithEffect($action, $element='this', $speed='', $callback='', $immediatly=false) {
25 25
 		$element=Javascript::prep_element($element);
26 26
 		$speed=$this->_validate_speed($speed);
27 27
 		if ($callback!='') {
@@ -38,8 +38,8 @@  discard block
 block discarded – undo
38 38
 	 * @return string
39 39
 	 */
40 40
 	private function _validate_speed($speed) {
41
-		if (in_array($speed, array (
42
-				'slow','normal','fast'
41
+		if (in_array($speed, array(
42
+				'slow', 'normal', 'fast'
43 43
 		))) {
44 44
 			$speed='"'.$speed.'"';
45 45
 		} elseif (preg_match("/[^0-9]/", $speed)) {
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 * @param string $param
57 57
 	 * @param boolean $immediatly delayed if false
58 58
 	 */
59
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
59
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
60 60
 		$element=Javascript::prep_element($element);
61 61
 		if (isset($param)) {
62 62
 			$param=Javascript::prep_value($param);
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	 * @param boolean $immediatly delayed if false
77 77
 	 * @return string
78 78
 	 */
79
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
79
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
80 80
 		$to=Javascript::prep_element($to);
81 81
 		$element=Javascript::prep_element($element);
82 82
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 	 * @return string
94 94
 	 */
95 95
 	public function addClass($element='this', $class='', $immediatly=false) {
96
-		return $this->_genericCallValue('addClass',$element, $class, $immediatly);
96
+		return $this->_genericCallValue('addClass', $element, $class, $immediatly);
97 97
 	}
98 98
 
99 99
 	/**
@@ -103,8 +103,8 @@  discard block
 block discarded – undo
103 103
 	 * @param boolean $immediatly defers the execution if set to false
104 104
 	 * @return string
105 105
 	 */
106
-	public function after($to, $element, $immediatly=false){
107
-		return $this->_genericCallElement('after',$to, $element, $immediatly);
106
+	public function after($to, $element, $immediatly=false) {
107
+		return $this->_genericCallElement('after', $to, $element, $immediatly);
108 108
 	}
109 109
 
110 110
 	/**
@@ -114,8 +114,8 @@  discard block
 block discarded – undo
114 114
 	 * @param boolean $immediatly defers the execution if set to false
115 115
 	 * @return string
116 116
 	 */
117
-	public function before($to, $element, $immediatly=false){
118
-		return $this->_genericCallElement('before',$to, $element, $immediatly);
117
+	public function before($to, $element, $immediatly=false) {
118
+		return $this->_genericCallElement('before', $to, $element, $immediatly);
119 119
 	}
120 120
 
121 121
 	/**
@@ -143,8 +143,8 @@  discard block
 block discarded – undo
143 143
 	 * @param string $value
144 144
 	 * @param boolean $immediatly defers the execution if set to false
145 145
 	 */
146
-	public function val($element='this',$value='',$immediatly=false){
147
-		return $this->_genericCallValue('val',$element,$value,$immediatly);
146
+	public function val($element='this', $value='', $immediatly=false) {
147
+		return $this->_genericCallValue('val', $element, $value, $immediatly);
148 148
 	}
149 149
 
150 150
 	/**
@@ -154,7 +154,7 @@  discard block
 block discarded – undo
154 154
 	 * @param boolean $immediatly defers the execution if set to false
155 155
 	 */
156 156
 	public function html($element='this', $value='', $immediatly=false) {
157
-		return $this->_genericCallValue('html',$element, $value, $immediatly);
157
+		return $this->_genericCallValue('html', $element, $value, $immediatly);
158 158
 	}
159 159
 
160 160
 	/**
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 
174 174
 		$animations="\t\t\t";
175 175
 		if (\is_array($params)) {
176
-			foreach ( $params as $param => $value ) {
176
+			foreach ($params as $param => $value) {
177 177
 				$animations.=$param.': \''.$value.'\', ';
178 178
 			}
179 179
 		}
@@ -202,7 +202,7 @@  discard block
 block discarded – undo
202 202
 	 * @return string
203 203
 	 */
204 204
 	public function append($to, $element, $immediatly=false) {
205
-		return $this->_genericCallElement('append',$to, $element, $immediatly);
205
+		return $this->_genericCallElement('append', $to, $element, $immediatly);
206 206
 	}
207 207
 
208 208
 	/**
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
 	 * @return string
214 214
 	 */
215 215
 	public function prepend($to, $element, $immediatly=false) {
216
-		return $this->_genericCallElement('prepend',$to, $element, $immediatly);
216
+		return $this->_genericCallElement('prepend', $to, $element, $immediatly);
217 217
 	}
218 218
 
219 219
 	/**
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	 * @return string
227 227
 	 */
228 228
 	public function fadeIn($element='this', $speed='', $callback='', $immediatly=false) {
229
-		return $this->_showHideWithEffect("fadeIn",$element,$speed,$callback,$immediatly);
229
+		return $this->_showHideWithEffect("fadeIn", $element, $speed, $callback, $immediatly);
230 230
 	}
231 231
 
232 232
 	/**
@@ -239,7 +239,7 @@  discard block
 block discarded – undo
239 239
 	 * @return string
240 240
 	 */
241 241
 	public function fadeOut($element='this', $speed='', $callback='', $immediatly=false) {
242
-		return $this->_showHideWithEffect("fadeOut",$element,$speed,$callback,$immediatly);
242
+		return $this->_showHideWithEffect("fadeOut", $element, $speed, $callback, $immediatly);
243 243
 	}
244 244
 
245 245
 	/**
@@ -252,7 +252,7 @@  discard block
 block discarded – undo
252 252
 	 * @return string
253 253
 	 */
254 254
 	public function slideUp($element='this', $speed='', $callback='', $immediatly=false) {
255
-		return $this->_showHideWithEffect("slideUp",$element,$speed,$callback,$immediatly);
255
+		return $this->_showHideWithEffect("slideUp", $element, $speed, $callback, $immediatly);
256 256
 	}
257 257
 
258 258
 	/**
@@ -264,7 +264,7 @@  discard block
 block discarded – undo
264 264
 	 * @return string
265 265
 	 */
266 266
 	public function removeClass($element='this', $class='', $immediatly=false) {
267
-		return $this->_genericCall('removeClass',$element, $class, $immediatly);
267
+		return $this->_genericCall('removeClass', $element, $class, $immediatly);
268 268
 	}
269 269
 
270 270
 	/**
@@ -277,7 +277,7 @@  discard block
 block discarded – undo
277 277
 	 * @return string
278 278
 	 */
279 279
 	public function slideDown($element='this', $speed='', $callback='', $immediatly=false) {
280
-		return $this->_showHideWithEffect("slideDown",$element,$speed,$callback,$immediatly);
280
+		return $this->_showHideWithEffect("slideDown", $element, $speed, $callback, $immediatly);
281 281
 	}
282 282
 
283 283
 	/**
@@ -290,7 +290,7 @@  discard block
 block discarded – undo
290 290
 	 * @return string
291 291
 	 */
292 292
 	public function slideToggle($element='this', $speed='', $callback='', $immediatly=false) {
293
-		return $this->_showHideWithEffect("slideToggle",$element,$speed,$callback,$immediatly);
293
+		return $this->_showHideWithEffect("slideToggle", $element, $speed, $callback, $immediatly);
294 294
 	}
295 295
 
296 296
 	/**
@@ -303,7 +303,7 @@  discard block
 block discarded – undo
303 303
 	 * @return string
304 304
 	 */
305 305
 	public function hide($element='this', $speed='', $callback='', $immediatly=false) {
306
-		return $this->_showHideWithEffect("hide",$element,$speed,$callback,$immediatly);
306
+		return $this->_showHideWithEffect("hide", $element, $speed, $callback, $immediatly);
307 307
 	}
308 308
 
309 309
 	/**
@@ -316,7 +316,7 @@  discard block
 block discarded – undo
316 316
 	 * @return string
317 317
 	 */
318 318
 	public function toggle($element='this', $speed='', $callback='', $immediatly=false) {
319
-		return $this->_showHideWithEffect("toggle",$element,$speed,$callback,$immediatly);
319
+		return $this->_showHideWithEffect("toggle", $element, $speed, $callback, $immediatly);
320 320
 	}
321 321
 
322 322
 	/**
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
 	 * @return string
328 328
 	 */
329 329
 	public function toggleClass($element='this', $class='', $immediatly=false) {
330
-		return $this->_genericCallValue('toggleClass',$element, $class, $immediatly);
330
+		return $this->_genericCallValue('toggleClass', $element, $class, $immediatly);
331 331
 	}
332 332
 
333 333
 	/**
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
 	 * @return string
356 356
 	 */
357 357
 	public function show($element='this', $speed='', $callback='', $immediatly=false) {
358
-		return $this->_showHideWithEffect("show",$element,$speed,$callback,$immediatly);
358
+		return $this->_showHideWithEffect("show", $element, $speed, $callback, $immediatly);
359 359
 	}
360 360
 
361 361
 	/**
@@ -367,8 +367,8 @@  discard block
 block discarded – undo
367 367
 	 */
368 368
 	public function sortable($element, $options=array()) {
369 369
 		if (count($options)>0) {
370
-			$sort_options=array ();
371
-			foreach ( $options as $k => $v ) {
370
+			$sort_options=array();
371
+			foreach ($options as $k => $v) {
372 372
 				$sort_options[]="\n\t\t".$k.': '.$v."";
373 373
 			}
374 374
 			$sort_options=implode(",", $sort_options);
@@ -465,8 +465,8 @@  discard block
 block discarded – undo
465 465
 	 * @param boolean $immediatly
466 466
 	 * @return string
467 467
 	 */
468
-	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="",$immediatly=true) {
469
-		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation,$immediatly);
468
+	private function _doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param="", $preventDefault=false, $stopPropagation=false, $jsCallback="", $immediatly=true) {
469
+		return $this->_add_event($element, $this->_doJQuery($elementToModify, $jqueryCall, $param, $jsCallback), $event, $preventDefault, $stopPropagation, $immediatly);
470 470
 	}
471 471
 
472 472
 	/**
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 		$preventDefault=false;
485 485
 		$immediatly=true;
486 486
 		extract($parameters);
487
-		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback,$immediatly);
487
+		return $this->_doJQueryOn($event, $element, $elementToModify, $jqueryCall, $param, $preventDefault, $stopPropagation, $jsCallback, $immediatly);
488 488
 	}
489 489
 
490 490
 	/**
@@ -513,7 +513,7 @@  discard block
 block discarded – undo
513 513
 		$preventDefault=false;
514 514
 		$immediatly=true;
515 515
 		extract($parameters);
516
-		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation,$immediatly);
516
+		$script=$this->_add_event($element, $this->exec($js), $event, $preventDefault, $stopPropagation, $immediatly);
517 517
 		return $script;
518 518
 	}
519 519
 }
Please login to merge, or discard this patch.
Braces   +36 added lines, -24 removed lines patch added patch discarded remove patch
@@ -28,8 +28,9 @@  discard block
 block discarded – undo
28 28
 			$callback=", function(){\n{$callback}\n}";
29 29
 		}
30 30
 		$str="$({$element}).{$action}({$speed}{$callback});";
31
-		if ($immediatly)
32
-			$this->jquery_code_for_compile[]=$str;
31
+		if ($immediatly) {
32
+					$this->jquery_code_for_compile[]=$str;
33
+		}
33 34
 			return $str;
34 35
 	}
35 36
 	/**
@@ -61,10 +62,12 @@  discard block
 block discarded – undo
61 62
 		if (isset($param)) {
62 63
 			$param=Javascript::prep_value($param);
63 64
 			$str="$({$element}).{$jQueryCall}({$param});";
64
-		} else
65
-			$str="$({$element}).{$jQueryCall}();";
66
-		if ($immediatly)
67
-			$this->jquery_code_for_compile[]=$str;
65
+		} else {
66
+					$str="$({$element}).{$jQueryCall}();";
67
+		}
68
+		if ($immediatly) {
69
+					$this->jquery_code_for_compile[]=$str;
70
+		}
68 71
 		return $str;
69 72
 	}
70 73
 
@@ -80,8 +83,9 @@  discard block
 block discarded – undo
80 83
 		$to=Javascript::prep_element($to);
81 84
 		$element=Javascript::prep_element($element);
82 85
 		$str="$({$to}).{$jQueryCall}({$element});";
83
-		if ($immediatly)
84
-			$this->jquery_code_for_compile[]=$str;
86
+		if ($immediatly) {
87
+					$this->jquery_code_for_compile[]=$str;
88
+		}
85 89
 		return $str;
86 90
 	}
87 91
 	/**
@@ -130,10 +134,12 @@  discard block
 block discarded – undo
130 134
 		if (isset($value)) {
131 135
 			$value=Javascript::prep_value($value);
132 136
 			$str="$({$element}).attr(\"$attributeName\",{$value});";
133
-		} else
134
-			$str="$({$element}).attr(\"$attributeName\");";
135
-		if ($immediatly)
136
-			$this->jquery_code_for_compile[]=$str;
137
+		} else {
138
+					$str="$({$element}).attr(\"$attributeName\");";
139
+		}
140
+		if ($immediatly) {
141
+					$this->jquery_code_for_compile[]=$str;
142
+		}
137 143
 		return $str;
138 144
 	}
139 145
 
@@ -189,8 +195,9 @@  discard block
 block discarded – undo
189 195
 
190 196
 		$str="$({$element}).animate({\n$animations\n\t\t}".$speed.$extra.");";
191 197
 
192
-		if ($immediatly)
193
-			$this->jquery_code_for_compile[]=$str;
198
+		if ($immediatly) {
199
+					$this->jquery_code_for_compile[]=$str;
200
+		}
194 201
 		return $str;
195 202
 	}
196 203
 
@@ -340,8 +347,9 @@  discard block
 block discarded – undo
340 347
 		$element=Javascript::prep_element($element);
341 348
 		$str="$({$element}).trigger(\"$event\");";
342 349
 
343
-		if ($immediatly)
344
-			$this->jquery_code_for_compile[]=$str;
350
+		if ($immediatly) {
351
+					$this->jquery_code_for_compile[]=$str;
352
+		}
345 353
 		return $str;
346 354
 	}
347 355
 
@@ -403,8 +411,9 @@  discard block
 block discarded – undo
403 411
 			$str.="else{".$jsCodeIfFalse."}";
404 412
 		}
405 413
 
406
-		if ($immediatly)
407
-			$this->jquery_code_for_compile[]=$str;
414
+		if ($immediatly) {
415
+					$this->jquery_code_for_compile[]=$str;
416
+		}
408 417
 		return $str;
409 418
 	}
410 419
 
@@ -420,11 +429,13 @@  discard block
 block discarded – undo
420 429
 	private function _doJQuery($element, $jqueryCall, $param="", $jsCallback="", $immediatly=false) {
421 430
 		$param=Javascript::prep_value($param);
422 431
 		$callback="";
423
-		if ($jsCallback!="")
424
-			$callback=", function(event){\n{$jsCallback}\n}";
432
+		if ($jsCallback!="") {
433
+					$callback=", function(event){\n{$jsCallback}\n}";
434
+		}
425 435
 			$script="$(".Javascript::prep_element($element).").".$jqueryCall."(".$param.$callback.");\n";
426
-			if ($immediatly)
427
-				$this->jquery_code_for_compile[]=$script;
436
+			if ($immediatly) {
437
+							$this->jquery_code_for_compile[]=$script;
438
+			}
428 439
 				return $script;
429 440
 	}
430 441
 
@@ -495,8 +506,9 @@  discard block
 block discarded – undo
495 506
 	 */
496 507
 	public function exec($js, $immediatly=false) {
497 508
 		$script=$js."\n";
498
-		if ($immediatly)
499
-			$this->jquery_code_for_compile[]=$script;
509
+		if ($immediatly) {
510
+					$this->jquery_code_for_compile[]=$script;
511
+		}
500 512
 		return $script;
501 513
 	}
502 514
 
Please login to merge, or discard this patch.
Doc Comments   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -11,6 +11,11 @@  discard block
 block discarded – undo
11 11
  */
12 12
 trait JsUtilsActionsTrait {
13 13
 
14
+	/**
15
+	 * @param string $element
16
+	 * @param string $js
17
+	 * @param string $event
18
+	 */
14 19
 	abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true);
15 20
 	/**
16 21
 	 * show or hide with effect
@@ -35,7 +40,7 @@  discard block
 block discarded – undo
35 40
 	}
36 41
 	/**
37 42
 	 * Ensures the speed parameter is valid for jQuery
38
-	 * @param string|int $speed
43
+	 * @param string $speed
39 44
 	 * @return string
40 45
 	 */
41 46
 	private function _validate_speed($speed) {
@@ -364,7 +369,7 @@  discard block
 block discarded – undo
364 369
 	 *
365 370
 	 * @param string $element
366 371
 	 * @param array $options
367
-	 * @return void
372
+	 * @return string
368 373
 	 */
369 374
 	public function sortable($element, $options=array()) {
370 375
 		if (count($options)>0) {
@@ -435,7 +440,7 @@  discard block
 block discarded – undo
435 440
 	 * @param string $jqueryCall the JQuery callback
436 441
 	 * @param mixed $param array or string parameters
437 442
 	 * @param string $jsCallback javascript code to execute after the jquery call
438
-	 * @return mixed
443
+	 * @return string
439 444
 	 */
440 445
 	public function doJQuery($element, $jqueryCall, $param="", $jsCallback="") {
441 446
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, true);
@@ -447,7 +452,7 @@  discard block
 block discarded – undo
447 452
 	 * @param string $jqueryCall the JQuery callback
448 453
 	 * @param mixed $param array or string parameters
449 454
 	 * @param string $jsCallback javascript code to execute after the jquery call
450
-	 * @return mixed
455
+	 * @return string
451 456
 	 */
452 457
 	public function doJQueryDeferred($element, $jqueryCall, $param="", $jsCallback="") {
453 458
 		return $this->_doJQuery($element, $jqueryCall, $param, $jsCallback, false);
@@ -459,7 +464,7 @@  discard block
 block discarded – undo
459 464
 	 * @param string $element
460 465
 	 * @param string $elementToModify
461 466
 	 * @param string $jqueryCall
462
-	 * @param string|array $param
467
+	 * @param string $param
463 468
 	 * @param boolean $preventDefault
464 469
 	 * @param boolean $stopPropagation
465 470
 	 * @param string $jsCallback javascript code to execute after the jquery call
@@ -504,7 +509,6 @@  discard block
 block discarded – undo
504 509
 	/**
505 510
 	 * Executes the code $js
506 511
 	 * @param string $js Code to execute
507
-	 * @param boolean $immediatly delayed if false
508 512
 	 * @return String
509 513
 	 */
510 514
 	public function execAtLast($js) {
Please login to merge, or discard this patch.