Completed
Push — master ( d27f99...f4e97d )
by Jean-Christophe
03:35
created
Ajax/semantic/html/content/HtmlStepItem.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -8,52 +8,52 @@
 block discarded – undo
8 8
 class HtmlStepItem extends HtmlAbsractItem {
9 9
 
10 10
 	public function __construct($identifier, $content) {
11
-		parent::__construct($identifier,"step",$content);
11
+		parent::__construct($identifier, "step", $content);
12 12
 	}
13
-	protected function initContent($content){
14
-		if(\is_array($content)){
15
-			if(JArray::isAssociative($content)===false){
13
+	protected function initContent($content) {
14
+		if (\is_array($content)) {
15
+			if (JArray::isAssociative($content)===false) {
16 16
 				$icon=@$content[0];
17 17
 				$title=@$content[1];
18 18
 				$desc=@$content[2];
19 19
 				$status=@$content[3];
20
-			}else{
20
+			} else {
21 21
 				$icon=@$content["icon"];
22 22
 				$title=@$content["title"];
23 23
 				$desc=@$content["description"];
24 24
 				$status=@$content["status"];
25 25
 			}
26
-			if(isset($icon)){
26
+			if (isset($icon)) {
27 27
 				$this->setIcon($icon);
28 28
 			}
29
-			if(isset($status)){
29
+			if (isset($status)) {
30 30
 				$this->setStatus($status);
31 31
 			}
32
-			if(isset($title)){
33
-				$this->setTitle($title,$desc);
32
+			if (isset($title)) {
33
+				$this->setTitle($title, $desc);
34 34
 			}
35
-		}else{
35
+		} else {
36 36
 			$this->setContent($content);
37 37
 		}
38 38
 	}
39 39
 
40
-	public function setActive($value=true){
41
-		if($value)
40
+	public function setActive($value=true) {
41
+		if ($value)
42 42
 			$this->setStatus(StepStatus::ACTIVE);
43 43
 		else
44 44
 			$this->setStatus(StepStatus::NONE);
45 45
 		return $this;
46 46
 	}
47 47
 
48
-	public function setCompleted(){
48
+	public function setCompleted() {
49 49
 		return $this->setStatus(StepStatus::COMPLETED);
50 50
 	}
51 51
 
52
-	public function setStatus($status){
52
+	public function setStatus($status) {
53 53
 		return $this->addToPropertyCtrl("class", $status, StepStatus::getConstants());
54 54
 	}
55 55
 
56
-	public function removeStatus(){
56
+	public function removeStatus() {
57 57
 		$this->removePropertyValues("class", StepStatus::getConstants());
58 58
 	}
59 59
 }
60 60
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlMenuItem.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -9,27 +9,27 @@
 block discarded – undo
9 9
 class HtmlMenuItem extends HtmlSemDoubleElement {
10 10
 	use MenuItemTrait;
11 11
 	public function __construct($identifier, $content) {
12
-		parent::__construct($identifier,"div","item",$content);
12
+		parent::__construct($identifier, "div", "item", $content);
13 13
 	}
14 14
 
15
-	protected function initContent($content){
16
-		if(\is_array($content)){
17
-			if(JArray::isAssociative($content)===false){
15
+	protected function initContent($content) {
16
+		if (\is_array($content)) {
17
+			if (JArray::isAssociative($content)===false) {
18 18
 				$icon=@$content[0];
19 19
 				$title=@$content[1];
20 20
 				$desc=@$content[2];
21
-			}else{
21
+			} else {
22 22
 				$icon=@$content["icon"];
23 23
 				$title=@$content["title"];
24 24
 				$desc=@$content["description"];
25 25
 			}
26
-			if(isset($icon)){
26
+			if (isset($icon)) {
27 27
 				$this->addIcon($icon);
28 28
 			}
29
-			if(isset($title)){
30
-				$this->setTitle($title,$desc);
29
+			if (isset($title)) {
30
+				$this->setTitle($title, $desc);
31 31
 			}
32
-		}else{
32
+		} else {
33 33
 			$this->setContent($content);
34 34
 		}
35 35
 	}
Please login to merge, or discard this patch.
Ajax/semantic/html/content/HtmlListItem.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -9,15 +9,15 @@  discard block
 block discarded – undo
9 9
 	protected $image;
10 10
 
11 11
 	public function __construct($identifier, $content=NULL) {
12
-		parent::__construct($identifier,"item",$content);
12
+		parent::__construct($identifier, "item", $content);
13 13
 	}
14
-	protected function initContent($content){
15
-		if(\is_array($content)){
16
-			if(JArray::isAssociative($content)===false){
14
+	protected function initContent($content) {
15
+		if (\is_array($content)) {
16
+			if (JArray::isAssociative($content)===false) {
17 17
 				$icon=@$content[0];
18 18
 				$title=@$content[1];
19 19
 				$desc=@$content[2];
20
-			}else{
20
+			} else {
21 21
 				$icon=@$content["icon"];
22 22
 				$image=@$content["image"];
23 23
 				$title=@$content["title"];
@@ -25,21 +25,21 @@  discard block
 block discarded – undo
25 25
 				$desc=@$content["description"];
26 26
 				$items=@$content["items"];
27 27
 			}
28
-			if(isset($icon)){
28
+			if (isset($icon)) {
29 29
 				$this->setIcon($icon);
30 30
 			}
31
-			if(isset($image)){
31
+			if (isset($image)) {
32 32
 				$this->setImage($image);
33 33
 			}
34
-			if(isset($title)){
35
-				$this->setTitle($title,$desc);
36
-			}elseif (isset($header)===true){
37
-				$this->setTitle($header,$desc,"header");
34
+			if (isset($title)) {
35
+				$this->setTitle($title, $desc);
36
+			}elseif (isset($header)===true) {
37
+				$this->setTitle($header, $desc, "header");
38 38
 			}
39
-			if(isset($items)){
39
+			if (isset($items)) {
40 40
 				$this->addList($items);
41 41
 			}
42
-		}else{
42
+		} else {
43 43
 			$this->setContent($content);
44 44
 		}
45 45
 	}
@@ -50,11 +50,11 @@  discard block
 block discarded – undo
50 50
 		return $list;
51 51
 	}
52 52
 
53
-	public function getList(){
53
+	public function getList() {
54 54
 		return $this->content["list"];
55 55
 	}
56 56
 
57
-	public function getItem($index){
57
+	public function getItem($index) {
58 58
 		return $this->getList()->getItem($index);
59 59
 	}
60 60
 }
61 61
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/html/collections/menus/HtmlMenu.php 1 patch
Spacing   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -39,20 +39,20 @@  discard block
 block discarded – undo
39 39
 	 * @return \Ajax\semantic\html\collections\HtmlMenu
40 40
 	 */
41 41
 	public function setType($type="") {
42
-		return $this->addToPropertyCtrl("class", $type, array ("","item","text" ));
42
+		return $this->addToPropertyCtrl("class", $type, array("", "item", "text"));
43 43
 	}
44 44
 
45 45
 	public function setActiveItem($index) {
46 46
 		$item=$this->getItem($index);
47
-		if ($item !== null) {
47
+		if ($item!==null) {
48 48
 			$item->addToProperty("class", "active");
49 49
 		}
50 50
 		return $this;
51 51
 	}
52 52
 
53 53
 	private function getItemToInsert($item) {
54
-		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton ) {
55
-			$itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item);
54
+		if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton) {
55
+			$itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item);
56 56
 			$item=$itemO;
57 57
 		}
58 58
 		return $item;
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 
61 61
 	private function afterInsert($item) {
62 62
 		if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false)
63
-			$item->addToPropertyCtrl("class", "item", array ("item" ));
63
+			$item->addToPropertyCtrl("class", "item", array("item"));
64 64
 		else {
65 65
 			$this->setSecondary();
66 66
 		}
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
 	public function addItem($item) {
77 77
 		$number=$item;
78 78
 		$item=parent::addItem($this->getItemToInsert($item));
79
-		if(\is_int($number))
79
+		if (\is_int($number))
80 80
 			$item->setProperty("data-page", $number);
81 81
 		return $this->afterInsert($item);
82 82
 	}
@@ -94,15 +94,15 @@  discard block
 block discarded – undo
94 94
 
95 95
 	public function generateMenuAsItem($menu, $header=null) {
96 96
 		$count=$this->count();
97
-		$item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div");
97
+		$item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div");
98 98
 		if (isset($header)) {
99
-			$headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header");
99
+			$headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header");
100 100
 			$headerItem->setContent($header);
101 101
 			$item->addContent($headerItem);
102 102
 			$this->_itemHeader=$headerItem;
103 103
 		}
104
-		if(\is_array($menu)){
105
-			$menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu);
104
+		if (\is_array($menu)) {
105
+			$menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu);
106 106
 		}
107 107
 		$menu->setClass("menu");
108 108
 		$item->addContent($menu);
@@ -117,7 +117,7 @@  discard block
 block discarded – undo
117 117
 		$value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value);
118 118
 		$value->addContent(new HtmlIcon("", "dropdown"));
119 119
 		$value=$this->addItem($value);
120
-		$popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content);
120
+		$popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content);
121 121
 		$popup->setFlowing()->setPosition("bottom left")->setOn("click");
122 122
 		$this->wrap("", $popup);
123 123
 		return $popup;
@@ -126,7 +126,7 @@  discard block
 block discarded – undo
126 126
 	public function addDropdownAsItem($value, $items=NULL) {
127 127
 		$dd=$value;
128 128
 		if (\is_string($value)) {
129
-			$dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items);
129
+			$dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items);
130 130
 		}
131 131
 		$this->addItem($dd);
132 132
 		return $dd;
@@ -139,7 +139,7 @@  discard block
 block discarded – undo
139 139
 	 * @see \Ajax\common\html\html5\HtmlCollection::createItem()
140 140
 	 */
141 141
 	protected function createItem($value) {
142
-		$itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),"");
142
+		$itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), "");
143 143
 		$itemO->setTagName("a");
144 144
 		$itemO->setContent($value);
145 145
 		return $itemO;
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	}
151 151
 
152 152
 	public function setSecondary($value=true) {
153
-		if($value)
153
+		if ($value)
154 154
 			$this->addToProperty("class", "secondary");
155 155
 		else
156 156
 			$this->removePropertyValue("class", "secondary");
@@ -158,28 +158,28 @@  discard block
 block discarded – undo
158 158
 	}
159 159
 
160 160
 	public function setVertical() {
161
-		return $this->addToPropertyCtrl("class", "vertical", array ("vertical" ));
161
+		return $this->addToPropertyCtrl("class", "vertical", array("vertical"));
162 162
 	}
163 163
 
164 164
 	public function setPosition($value="right") {
165
-		return $this->addToPropertyCtrl("class", $value, array ("right","left" ));
165
+		return $this->addToPropertyCtrl("class", $value, array("right", "left"));
166 166
 	}
167 167
 
168 168
 	public function setPointing($value=Direction::NONE) {
169
-		return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing"));
169
+		return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing"));
170 170
 	}
171 171
 
172 172
 	public function asTab($vertical=false) {
173
-		$this->apply(function (HtmlDoubleElement &$item) {
173
+		$this->apply(function(HtmlDoubleElement&$item) {
174 174
 			$item->setTagName("a");
175 175
 		});
176
-		if ($vertical === true)
176
+		if ($vertical===true)
177 177
 			$this->setVertical();
178 178
 		return $this->addToProperty("class", "tabular");
179 179
 	}
180 180
 
181 181
 	public function asPagination() {
182
-		$this->apply(function (HtmlDoubleElement &$item) {
182
+		$this->apply(function(HtmlDoubleElement&$item) {
183 183
 			$item->setTagName("a");
184 184
 		});
185 185
 		return $this->addToProperty("class", "pagination");
@@ -216,10 +216,10 @@  discard block
 block discarded – undo
216 216
 	 */
217 217
 	public function setWidth($width) {
218 218
 		if (\is_int($width)) {
219
-			$width=Wide::getConstants()["W" . $width];
219
+			$width=Wide::getConstants()["W".$width];
220 220
 		}
221 221
 		$this->addToPropertyCtrl("class", $width, Wide::getConstants());
222
-		return $this->addToPropertyCtrl("class", "item", array ("item" ));
222
+		return $this->addToPropertyCtrl("class", "item", array("item"));
223 223
 	}
224 224
 
225 225
 	public function addImage($identifier, $src="", $alt="") {
@@ -234,8 +234,8 @@  discard block
 block discarded – undo
234 234
 		return $this->_itemHeader;
235 235
 	}
236 236
 
237
-	public function run(JsUtils $js){
238
-		$result= parent::run($js);
237
+	public function run(JsUtils $js) {
238
+		$result=parent::run($js);
239 239
 		return $result->setItemSelector(".item");
240 240
 	}
241 241
 }
242 242
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/semantic/widgets/base/FieldAsTrait.php 1 patch
Spacing   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -16,121 +16,121 @@
 block discarded – undo
16 16
  * @property InstanceViewer $_instanceViewer
17 17
  */
18 18
 
19
-trait FieldAsTrait{
19
+trait FieldAsTrait {
20 20
 
21 21
 	abstract protected function _getFieldIdentifier($prefix);
22
-	abstract public function setValueFunction($index,$callback);
22
+	abstract public function setValueFunction($index, $callback);
23 23
 
24
-	private function _getLabelField($caption,$icon=NULL){
25
-		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"),$caption,$icon);
24
+	private function _getLabelField($caption, $icon=NULL) {
25
+		$label=new HtmlLabel($this->_getFieldIdentifier("lbl"), $caption, $icon);
26 26
 		return $label;
27 27
 	}
28 28
 
29
-	protected function _addRules($element,&$attributes){}
29
+	protected function _addRules($element, &$attributes) {}
30 30
 
31
-	protected function _fieldAs($elementCallback,$index,$attributes=NULL,$prefix=null){
32
-		$this->setValueFunction($index,function($value) use ($index,&$attributes,$elementCallback,$prefix){
31
+	protected function _fieldAs($elementCallback, $index, $attributes=NULL, $prefix=null) {
32
+		$this->setValueFunction($index, function($value) use ($index, &$attributes, $elementCallback, $prefix){
33 33
 			$name=$this->_instanceViewer->getCaption($index)."[]";
34
-			if(isset($attributes["name"])){
34
+			if (isset($attributes["name"])) {
35 35
 				$name=$attributes["name"];
36 36
 			}
37
-			$element=$elementCallback($this->_getFieldIdentifier($prefix),$name,$value,"");
38
-			if(\is_array($attributes))
39
-				$this->_applyAttributes($element, $attributes,$index);
37
+			$element=$elementCallback($this->_getFieldIdentifier($prefix), $name, $value, "");
38
+			if (\is_array($attributes))
39
+				$this->_applyAttributes($element, $attributes, $index);
40 40
 			return $element;
41 41
 		});
42 42
 			return $this;
43 43
 	}
44 44
 
45 45
 
46
-	public function fieldAsProgress($index,$label=NULL, $attributes=array()){
47
-		$this->setValueFunction($index,function($value) use($label,$attributes){
48
-			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"),$value,$label,$attributes);
46
+	public function fieldAsProgress($index, $label=NULL, $attributes=array()) {
47
+		$this->setValueFunction($index, function($value) use($label, $attributes){
48
+			$pb=new HtmlProgress($this->_getFieldIdentifier("pb"), $value, $label, $attributes);
49 49
 			return $pb;
50 50
 		});
51 51
 			return $this;
52 52
 	}
53 53
 
54
-	public function fieldAsRating($index,$max=5, $icon=""){
55
-		$this->setValueFunction($index,function($value) use($max,$icon){
56
-			$rating=new HtmlRating($this->_getFieldIdentifier("rat"),$value,$max,$icon);
54
+	public function fieldAsRating($index, $max=5, $icon="") {
55
+		$this->setValueFunction($index, function($value) use($max, $icon){
56
+			$rating=new HtmlRating($this->_getFieldIdentifier("rat"), $value, $max, $icon);
57 57
 			return $rating;
58 58
 		});
59 59
 			return $this;
60 60
 	}
61 61
 
62
-	public function fieldAsLabel($index,$icon=NULL){
63
-		$this->setValueFunction($index,function($caption) use($icon){
64
-			$lbl=$this->_getLabelField($caption,$icon);
62
+	public function fieldAsLabel($index, $icon=NULL) {
63
+		$this->setValueFunction($index, function($caption) use($icon){
64
+			$lbl=$this->_getLabelField($caption, $icon);
65 65
 			return $lbl;
66 66
 		});
67 67
 			return $this;
68 68
 	}
69 69
 
70
-	public function fieldAsHeader($index,$niveau=1,$icon=NULL,$attributes=NULL){
71
-		return $this->_fieldAs(function($id,$name,$value) use($niveau,$icon){
72
-			$header=new HtmlHeader($id,$niveau,$value);
73
-			if(isset($icon))
70
+	public function fieldAsHeader($index, $niveau=1, $icon=NULL, $attributes=NULL) {
71
+		return $this->_fieldAs(function($id, $name, $value) use($niveau, $icon){
72
+			$header=new HtmlHeader($id, $niveau, $value);
73
+			if (isset($icon))
74 74
 				$header->asIcon($icon, $value);
75 75
 			return $header;
76
-		}, $index,$attributes,"header");
76
+		}, $index, $attributes, "header");
77 77
 	}
78 78
 
79 79
 
80
-	public function fieldAsImage($index,$size=Size::MINI,$circular=false){
81
-		$this->setValueFunction($index,function($img) use($size,$circular){
82
-			$image=new HtmlImage($this->_getFieldIdentifier("image"),$img);$image->setSize($size);if($circular)$image->setCircular();
80
+	public function fieldAsImage($index, $size=Size::MINI, $circular=false) {
81
+		$this->setValueFunction($index, function($img) use($size, $circular){
82
+			$image=new HtmlImage($this->_getFieldIdentifier("image"), $img); $image->setSize($size); if ($circular)$image->setCircular();
83 83
 			return $image;
84 84
 		});
85 85
 			return $this;
86 86
 	}
87 87
 
88
-	public function fieldAsAvatar($index,$attributes=NULL){
89
-		return $this->_fieldAs(function($id,$name,$value){
90
-			$img=new HtmlImage($id,$value);
88
+	public function fieldAsAvatar($index, $attributes=NULL) {
89
+		return $this->_fieldAs(function($id, $name, $value) {
90
+			$img=new HtmlImage($id, $value);
91 91
 			$img->asAvatar();
92 92
 			return $img;
93
-		}, $index,$attributes,"avatar");
93
+		}, $index, $attributes, "avatar");
94 94
 	}
95 95
 
96
-	public function fieldAsRadio($index,$attributes=NULL){
97
-		return $this->_fieldAs(function($id,$name,$value){
98
-			$input= new HtmlRadio($id,$name,$value,$value);
96
+	public function fieldAsRadio($index, $attributes=NULL) {
97
+		return $this->_fieldAs(function($id, $name, $value) {
98
+			$input=new HtmlRadio($id, $name, $value, $value);
99 99
 			return $input;
100
-		}, $index,$attributes,"radio");
100
+		}, $index, $attributes, "radio");
101 101
 	}
102 102
 
103
-	public function fieldAsInput($index,$attributes=NULL){
104
-		return $this->_fieldAs(function($id,$name,$value){
105
-			$input= new HtmlInput($id,"text",$value);
103
+	public function fieldAsInput($index, $attributes=NULL) {
104
+		return $this->_fieldAs(function($id, $name, $value) {
105
+			$input=new HtmlInput($id, "text", $value);
106 106
 			//TODO check getField
107 107
 			$input->setName($name);
108 108
 			return $input;
109
-		}, $index,$attributes,"input");
109
+		}, $index, $attributes, "input");
110 110
 	}
111 111
 
112
-	public function fieldAsHidden($index,$attributes=NULL){
113
-		if(\is_array($attributes)===false){
112
+	public function fieldAsHidden($index, $attributes=NULL) {
113
+		if (\is_array($attributes)===false) {
114 114
 			$attributes=[];
115 115
 		}
116 116
 		$attributes["imputType"]="hidden";
117
-		return $this->fieldAsInput($index,$attributes);
117
+		return $this->fieldAsInput($index, $attributes);
118 118
 	}
119 119
 
120
-	public function fieldAsCheckbox($index,$attributes=NULL){
121
-		return $this->_fieldAs(function($id,$name,$value){
122
-			$input=new HtmlCheckbox($id,"",$this->_instanceViewer->getIdentifier());
120
+	public function fieldAsCheckbox($index, $attributes=NULL) {
121
+		return $this->_fieldAs(function($id, $name, $value) {
122
+			$input=new HtmlCheckbox($id, "", $this->_instanceViewer->getIdentifier());
123 123
 			$input->setChecked(JString::isBooleanTrue($value));
124 124
 			$input->getField()->setProperty("name", $name);
125 125
 			return $input;
126
-		}, $index,$attributes,"ck");
126
+		}, $index, $attributes, "ck");
127 127
 	}
128 128
 
129
-	public function fieldAsDropDown($index,$elements=[],$multiple=false,$attributes=NULL){
130
-		return $this->_fieldAs(function($id,$name,$value) use($elements,$multiple){
131
-			$dd=new HtmlDropdown($id,$value,$elements);
132
-			$dd->asSelect($name,$multiple);
129
+	public function fieldAsDropDown($index, $elements=[], $multiple=false, $attributes=NULL) {
130
+		return $this->_fieldAs(function($id, $name, $value) use($elements, $multiple){
131
+			$dd=new HtmlDropdown($id, $value, $elements);
132
+			$dd->asSelect($name, $multiple);
133 133
 			return $dd;
134
-		}, $index,$attributes,"dd");
134
+		}, $index, $attributes, "dd");
135 135
 	}
136 136
 }
137 137
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/Jquery.php 2 patches
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -15,16 +15,16 @@  discard block
 block discarded – undo
15 15
  * @license Apache 2 http://www.apache.org/licenses/
16 16
  **/
17 17
 class Jquery {
18
-	use JqueryEventsTrait,JqueryAjaxTrait,JqueryActionsTrait;
18
+	use JqueryEventsTrait, JqueryAjaxTrait, JqueryActionsTrait;
19 19
 	protected $_ui;
20 20
 	protected $_bootstrap;
21 21
 	protected $_semantic;
22
-	protected $jquery_code_for_compile=array ();
22
+	protected $jquery_code_for_compile=array();
23 23
 	protected $jsUtils;
24 24
 	protected $params;
25 25
 
26
-	protected $jquery_events=array (
27
-			"bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload"
26
+	protected $jquery_events=array(
27
+			"bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload"
28 28
 	);
29 29
 
30 30
 	public function ui($ui=NULL) {
@@ -48,9 +48,9 @@  discard block
 block discarded – undo
48 48
 		return $this->_semantic;
49 49
 	}
50 50
 
51
-	public function __construct($params,$jsUtils) {
51
+	public function __construct($params, $jsUtils) {
52 52
 		$this->params=array();
53
-		foreach ( $params as $key => $val ) {
53
+		foreach ($params as $key => $val) {
54 54
 				$this->params[$key]=$params[$key];
55 55
 		}
56 56
 		$this->jsUtils=$jsUtils;
@@ -114,12 +114,12 @@  discard block
 block discarded – undo
114 114
 	 */
115 115
 	public function _output($array_js='') {
116 116
 		if (!is_array($array_js)) {
117
-			$array_js=array (
117
+			$array_js=array(
118 118
 					$array_js
119 119
 			);
120 120
 		}
121 121
 
122
-		foreach ( $array_js as $js ) {
122
+		foreach ($array_js as $js) {
123 123
 			$this->jquery_code_for_compile[]="\t$js\n";
124 124
 		}
125 125
 	}
@@ -131,7 +131,7 @@  discard block
 block discarded – undo
131 131
 	 * @param string $param
132 132
 	 * @param boolean $immediatly delayed if false
133 133
 	 */
134
-	public function _genericCallValue($jQueryCall,$element='this', $param="", $immediatly=false) {
134
+	public function _genericCallValue($jQueryCall, $element='this', $param="", $immediatly=false) {
135 135
 		$element=Javascript::prep_element($element);
136 136
 		if (isset($param)) {
137 137
 			$param=Javascript::prep_value($param);
@@ -150,7 +150,7 @@  discard block
 block discarded – undo
150 150
 	 * @param boolean $immediatly delayed if false
151 151
 	 * @return string
152 152
 	 */
153
-	public function _genericCallElement($jQueryCall,$to='this', $element, $immediatly=false) {
153
+	public function _genericCallElement($jQueryCall, $to='this', $element, $immediatly=false) {
154 154
 		$to=Javascript::prep_element($to);
155 155
 		$element=Javascript::prep_element($element);
156 156
 		$str="$({$to}).{$jQueryCall}({$element});";
@@ -168,8 +168,8 @@  discard block
 block discarded – undo
168 168
 	 */
169 169
 	public function sortable($element, $options=array()) {
170 170
 		if (count($options)>0) {
171
-			$sort_options=array ();
172
-			foreach ( $options as $k => $v ) {
171
+			$sort_options=array();
172
+			foreach ($options as $k => $v) {
173 173
 				$sort_options[]="\n\t\t".$k.': '.$v."";
174 174
 			}
175 175
 			$sort_options=implode(",", $sort_options);
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
 	 * @param boolean $stopPropagation Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
202 202
 	 * @return string
203 203
 	 */
204
-	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true) {
204
+	public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true) {
205 205
 		if (is_array($js)) {
206 206
 			$js=implode("\n\t\t", $js);
207 207
 		}
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
216 216
 		else
217 217
 			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
218
-		if($immediatly)
218
+		if ($immediatly)
219 219
 			$this->jquery_code_for_compile[]=$event;
220 220
 		return $event;
221 221
 	}
@@ -247,18 +247,18 @@  discard block
 block discarded – undo
247 247
 		$script.='});';
248 248
 
249 249
 		$this->jquery_code_for_compile=array();
250
-		if($this->params["debug"]==false){
250
+		if ($this->params["debug"]==false) {
251 251
 			$script=$this->minify($script);
252 252
 		}
253 253
 		$output=($script_tags===FALSE) ? $script : $this->inline($script);
254 254
 
255
-		if ($view!==NULL){
256
-			$this->jsUtils->createScriptVariable($view,$view_var, $output);
255
+		if ($view!==NULL) {
256
+			$this->jsUtils->createScriptVariable($view, $view_var, $output);
257 257
 		}
258 258
 		return $output;
259 259
 	}
260 260
 
261
-	private function _compileLibrary($library){
261
+	private function _compileLibrary($library) {
262 262
 		if ($library!=NULL) {
263 263
 			if ($library->isAutoCompile()) {
264 264
 				$library->compile(true);
@@ -276,7 +276,7 @@  discard block
 block discarded – undo
276 276
 	 * @return void
277 277
 	 */
278 278
 	public function _clear_compile() {
279
-		$this->jquery_code_for_compile=array ();
279
+		$this->jquery_code_for_compile=array();
280 280
 	}
281 281
 
282 282
 	/**
@@ -285,18 +285,18 @@  discard block
 block discarded – undo
285 285
 	 */
286 286
 	public function _document_ready($js) {
287 287
 		if (!is_array($js)) {
288
-			$js=array (
288
+			$js=array(
289 289
 					$js
290 290
 			);
291 291
 		}
292 292
 
293
-		foreach ( $js as $script ) {
293
+		foreach ($js as $script) {
294 294
 			$this->jquery_code_for_compile[]=$script;
295 295
 		}
296 296
 	}
297 297
 
298 298
 	private function minify($input) {
299
-	if(trim($input) === "") return $input;
299
+	if (trim($input)==="") return $input;
300 300
 	return preg_replace(
301 301
 			array(
302 302
 					// Remove comment(s)
Please login to merge, or discard this patch.
Braces   +20 added lines, -13 removed lines patch added patch discarded remove patch
@@ -136,10 +136,12 @@  discard block
 block discarded – undo
136 136
 		if (isset($param)) {
137 137
 			$param=Javascript::prep_value($param);
138 138
 			$str="$({$element}).{$jQueryCall}({$param});";
139
-		} else
140
-			$str="$({$element}).{$jQueryCall}();";
141
-			if ($immediatly)
142
-				$this->jquery_code_for_compile[]=$str;
139
+		} else {
140
+					$str="$({$element}).{$jQueryCall}();";
141
+		}
142
+			if ($immediatly) {
143
+							$this->jquery_code_for_compile[]=$str;
144
+			}
143 145
 			return $str;
144 146
 	}
145 147
 	/**
@@ -154,8 +156,9 @@  discard block
 block discarded – undo
154 156
 		$to=Javascript::prep_element($to);
155 157
 		$element=Javascript::prep_element($element);
156 158
 		$str="$({$to}).{$jQueryCall}({$element});";
157
-		if ($immediatly)
158
-			$this->jquery_code_for_compile[]=$str;
159
+		if ($immediatly) {
160
+					$this->jquery_code_for_compile[]=$str;
161
+		}
159 162
 			return $str;
160 163
 	}
161 164
 
@@ -211,12 +214,14 @@  discard block
 block discarded – undo
211 214
 		if ($stopPropagation===true) {
212 215
 			$js="event.stopPropagation();\n".$js;
213 216
 		}
214
-		if (array_search($event, $this->jquery_events)===false)
215
-			$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
216
-		else
217
-			$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
218
-		if($immediatly)
219
-			$this->jquery_code_for_compile[]=$event;
217
+		if (array_search($event, $this->jquery_events)===false) {
218
+					$event="\n\t$(".Javascript::prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n";
219
+		} else {
220
+					$event="\n\t$(".Javascript::prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n";
221
+		}
222
+		if($immediatly) {
223
+					$this->jquery_code_for_compile[]=$event;
224
+		}
220 225
 		return $event;
221 226
 	}
222 227
 
@@ -296,7 +301,9 @@  discard block
 block discarded – undo
296 301
 	}
297 302
 
298 303
 	private function minify($input) {
299
-	if(trim($input) === "") return $input;
304
+	if(trim($input) === "") {
305
+		return $input;
306
+	}
300 307
 	return preg_replace(
301 308
 			array(
302 309
 					// Remove comment(s)
Please login to merge, or discard this patch.