Completed
Push — master ( 8e32f8...32ad89 )
by Jean-Christophe
03:26
created
Ajax/bootstrap/components/Splitbutton.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -9,10 +9,10 @@
 block discarded – undo
9 9
 	 * @see \Ajax\common\SimpleComponent::compileEvents()
10 10
 	 */
11 11
 	protected function compileEvents() {
12
-		foreach ( $this->events as $event => $jsCode ) {
12
+		foreach ($this->events as $event => $jsCode) {
13 13
 			if ($event==="buttonClick") {
14 14
 				$this->jquery_code_for_compile []="$( \"#split-".preg_replace('/[^a-zA-Z0-9\-.]/s', '', $this->attachTo)."\" ).on(\"click\" , function( event, data ) {".$jsCode."});";
15
-			} else {
15
+			}else {
16 16
 				$this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).on(\"".$event."\" , function( event, data ) {".$jsCode."});";
17 17
 			}
18 18
 		}
Please login to merge, or discard this patch.
Ajax/bootstrap/components/Tabs.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
 
19 19
 	public function __construct(JsUtils $js) {
20 20
 		parent::__construct($js);
21
-		$this->tabs=array ();
21
+		$this->tabs=array();
22 22
 	}
23 23
 
24 24
 	public function getTabs() {
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	public function getTab($index) {
38
-		if ($index>0&&$index<sizeof($this->tabs))
38
+		if ($index>0 && $index<sizeof($this->tabs))
39 39
 			return $this->tabs [$index];
40 40
 	}
41 41
 
Please login to merge, or discard this patch.
Braces   +15 added lines, -10 removed lines patch added patch discarded remove patch
@@ -35,8 +35,9 @@  discard block
 block discarded – undo
35 35
 	}
36 36
 
37 37
 	public function getTab($index) {
38
-		if ($index>0&&$index<sizeof($this->tabs))
39
-			return $this->tabs [$index];
38
+		if ($index>0&&$index<sizeof($this->tabs)) {
39
+					return $this->tabs [$index];
40
+		}
40 41
 	}
41 42
 
42 43
 	public function show($index) {
@@ -52,8 +53,9 @@  discard block
 block discarded – undo
52 53
 	 */
53 54
 	public function onShow($index, $jsCode) {
54 55
 		$tab=$this->getTab($index);
55
-		if (isset($tab))
56
-			return $tab->onShow($jsCode);
56
+		if (isset($tab)) {
57
+					return $tab->onShow($jsCode);
58
+		}
57 59
 	}
58 60
 
59 61
 	/**
@@ -64,8 +66,9 @@  discard block
 block discarded – undo
64 66
 	 */
65 67
 	public function onShown($index, $jsCode) {
66 68
 		$tab=$this->getTab($index);
67
-		if (isset($tab))
68
-			return $tab->onShown($jsCode);
69
+		if (isset($tab)) {
70
+					return $tab->onShown($jsCode);
71
+		}
69 72
 	}
70 73
 
71 74
 	/**
@@ -76,8 +79,9 @@  discard block
 block discarded – undo
76 79
 	 */
77 80
 	public function onHide($index, $jsCode) {
78 81
 		$tab=$this->getTab($index);
79
-		if (isset($tab))
80
-			return $tab->onShow($jsCode);
82
+		if (isset($tab)) {
83
+					return $tab->onShow($jsCode);
84
+		}
81 85
 	}
82 86
 
83 87
 	/**
@@ -88,7 +92,8 @@  discard block
 block discarded – undo
88 92
 	 */
89 93
 	public function onHidden($index, $jsCode) {
90 94
 		$tab=$this->getTab($index);
91
-		if (isset($tab))
92
-			return $tab->onShow($jsCode);
95
+		if (isset($tab)) {
96
+					return $tab->onShow($jsCode);
97
+		}
93 98
 	}
94 99
 }
95 100
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlAccordion.php 2 patches
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 		$this->setClass("panel-group");
20 20
 		$this->setRole("tablist");
21 21
 		$this->setProperty("aria-multiselectable", "true");
22
-		$this->content=array ();
22
+		$this->content=array();
23 23
 	}
24 24
 
25 25
 	public function addPanel($title, $content) {
@@ -45,8 +45,8 @@  discard block
 block discarded – undo
45 45
 	 * @param string $action a Phalcon action
46 46
 	 * @param $params The parameters to pass to the view
47 47
 	 */
48
-	public function renderContentPanel($title,$view, $controller, $action, $params=NULL) {
49
-		$template=$view->getRender($controller, $action, $params, function ($view) {
48
+	public function renderContentPanel($title, $view, $controller, $action, $params=NULL) {
49
+		$template=$view->getRender($controller, $action, $params, function($view) {
50 50
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
51 51
 		});
52 52
 		return $this->addPanel($title, $template);
@@ -59,19 +59,19 @@  discard block
 block discarded – undo
59 59
 	 * @param string $controller a Phalcon controller
60 60
 	 * @param string $action a Phalcon action
61 61
 	 */
62
-	public function forwardPanel($title,$initialController,$controller,$action){
63
-		$dispatcher = $initialController->dispatcher;
62
+	public function forwardPanel($title, $initialController, $controller, $action) {
63
+		$dispatcher=$initialController->dispatcher;
64 64
 		$dispatcher->setControllerName($controller);
65 65
 		$dispatcher->setActionName($action);
66 66
 		$dispatcher->dispatch();
67
-		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(),$dispatcher->getParams(), function ($view) {
67
+		$template=$initialController->view->getRender($dispatcher->getControllerName(), $dispatcher->getActionName(), $dispatcher->getParams(), function($view) {
68 68
 			$view->setRenderLevel(View::LEVEL_ACTION_VIEW);
69 69
 		});
70 70
 		return $this->addPanel($title, $template);
71 71
 	}
72 72
 
73 73
 	public function run(JsUtils $js) {
74
-		foreach ( $this->content as $content ) {
74
+		foreach ($this->content as $content) {
75 75
 			$content->run($js);
76 76
 		}
77 77
 	}
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -77,7 +77,8 @@
 block discarded – undo
77 77
 	}
78 78
 
79 79
 	public function getPanel($index) {
80
-		if ($index<sizeof($this->content))
81
-			return $this->content [$index];
80
+		if ($index<sizeof($this->content)) {
81
+					return $this->content [$index];
82
+		}
82 83
 	}
83 84
 }
84 85
\ No newline at end of file
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlAlert.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -44,13 +44,13 @@  discard block
 block discarded – undo
44 44
 
45 45
 	public function addCloseButton() {
46 46
 		$button=new HtmlButton("close-".$this->identifier);
47
-		$button->setProperties(array (
47
+		$button->setProperties(array(
48 48
 				"class" => "close",
49 49
 				"data-dismiss" => "alert",
50 50
 				"aria-label" => "close"
51 51
 		));
52 52
 		$button->setValue('<span aria-hidden="true">&times;</span>');
53
-		$this->addToPropertyCtrl("class", "alert-dismissible", array (
53
+		$this->addToPropertyCtrl("class", "alert-dismissible", array(
54 54
 				"alert-dismissible"
55 55
 		));
56 56
 		$this->button=$button;
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::compile()
80 80
 	 */
81 81
 	public function compile(JsUtils $js=NULL, View $view=NULL) {
82
-		if ($this->closeable&&$this->button==="") {
82
+		if ($this->closeable && $this->button==="") {
83 83
 			$this->addCloseButton();
84 84
 		}
85 85
 		return parent::compile($js, $view);
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlButton.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	 * @return \Ajax\bootstrap\html\HtmlButton
72 72
 	 */
73 73
 	public function setActive() {
74
-		return $this->addToPropertyCtrl("class", "active", array (
74
+		return $this->addToPropertyCtrl("class", "active", array(
75 75
 				"active"
76 76
 		));
77 77
 	}
@@ -81,7 +81,7 @@  discard block
 block discarded – undo
81 81
 	 * @return \Ajax\bootstrap\html\HtmlButton
82 82
 	 */
83 83
 	public function setDisabled() {
84
-		return $this->addToPropertyCtrl("class", "disabled", array (
84
+		return $this->addToPropertyCtrl("class", "disabled", array(
85 85
 				"disabled"
86 86
 		));
87 87
 	}
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 	 */
110 110
 	public function fromArray($array) {
111 111
 		$array=parent::fromArray($array);
112
-		foreach ( $array as $key => $value ) {
112
+		foreach ($array as $key => $value) {
113 113
 			$this->setProperty($key, $value);
114 114
 		}
115 115
 		return $array;
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlCollapse.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@
 block discarded – undo
35 35
 		if (!isset($id))
36 36
 			if ($this->element->getTagName()==="a")
37 37
 				$id=$this->element->getProperty("href");
38
-		if (!isset($id)||$id==="#") {
38
+		if (!isset($id) || $id==="#") {
39 39
 			$id="collapse-".$this->element->getIdentifier();
40 40
 			$this->attachTo($id);
41 41
 		}
Please login to merge, or discard this patch.
Braces   +11 added lines, -8 removed lines patch added patch discarded remove patch
@@ -24,17 +24,19 @@  discard block
 block discarded – undo
24 24
 
25 25
 	public function attachTo($identifier) {
26 26
 		$this->element->setProperty("aria-controls", $identifier);
27
-		if ($this->element->getTagName()==="a")
28
-			$this->element->setProperty("href", "#".$identifier);
29
-		else
30
-			$this->element->setProperty("data-target", "#".$identifier);
27
+		if ($this->element->getTagName()==="a") {
28
+					$this->element->setProperty("href", "#".$identifier);
29
+		} else {
30
+					$this->element->setProperty("data-target", "#".$identifier);
31
+		}
31 32
 	}
32 33
 
33 34
 	public function getAttachedZone() {
34 35
 		$id=$this->element->getProperty("aria-controls");
35
-		if (!isset($id))
36
-			if ($this->element->getTagName()==="a")
36
+		if (!isset($id)) {
37
+					if ($this->element->getTagName()==="a")
37 38
 				$id=$this->element->getProperty("href");
39
+		}
38 40
 		if (!isset($id)||$id==="#") {
39 41
 			$id="collapse-".$this->element->getIdentifier();
40 42
 			$this->attachTo($id);
@@ -49,8 +51,9 @@  discard block
 block discarded – undo
49 51
 	}
50 52
 
51 53
 	public function createCollapsedZone($content="", $attachTo=NULL) {
52
-		if (isset($attachTo))
53
-			$this->attachTo($attachTo);
54
+		if (isset($attachTo)) {
55
+					$this->attachTo($attachTo);
56
+		}
54 57
 		$collapsedZone=new HtmlDoubleElement($this->getAttachedZone());
55 58
 		$collapsedZone->setProperty("class", "collapse");
56 59
 		$collapsedZone->setContent($content);
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlDropdown.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 	protected $class="dropdown-toggle";
18 18
 	protected $mClass="dropdown";
19 19
 	protected $mTagName="div";
20
-	protected $items=array ();
20
+	protected $items=array();
21 21
 
22 22
 	/**
23 23
 	 *
@@ -87,9 +87,9 @@  discard block
 block discarded – undo
87 87
 	 * @return HtmlDropdownItem
88 88
 	 */
89 89
 	public function addItem($caption, $href="#") {
90
-		if($caption instanceof HtmlDropdownItem){
90
+		if ($caption instanceof HtmlDropdownItem) {
91 91
 			$item=$caption;
92
-		}else{
92
+		}else {
93 93
 			$iid=$this->getItemsCount()+1;
94 94
 			$item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
95 95
 			$item->setCaption($caption)->setHref($href);
@@ -109,14 +109,14 @@  discard block
 block discarded – undo
109 109
 	public function addItems($items) {
110 110
 		$iid=$this->getItemsCount()+1;
111 111
 		if (is_array($items)) {
112
-			foreach ( $items as $item ) {
112
+			foreach ($items as $item) {
113 113
 				if (is_string($item)) {
114 114
 					$this->addItem($item);
115
-				} else if (is_array($item)) {
115
+				}else if (is_array($item)) {
116 116
 					$dropDownItem=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
117 117
 					$dropDownItem->fromArray($item);
118 118
 					$this->items []=$dropDownItem;
119
-				} else if ($item instanceof HtmlDropdownItem) {
119
+				}else if ($item instanceof HtmlDropdownItem) {
120 120
 					$this->items []=$item;
121 121
 				}
122 122
 			}
@@ -136,7 +136,7 @@  discard block
 block discarded – undo
136 136
 	}
137 137
 
138 138
 	public function setItems($items) {
139
-		$this->items=array ();
139
+		$this->items=array();
140 140
 		$this->addItems($items);
141 141
 	}
142 142
 
@@ -171,7 +171,7 @@  discard block
 block discarded – undo
171 171
 	 */
172 172
 	public function run(JsUtils $js) {
173 173
 		if ($this->getProperty("role")==="nav") {
174
-			foreach ( $this->items as $dropdownItem ) {
174
+			foreach ($this->items as $dropdownItem) {
175 175
 				$dropdownItem->runNav($js);
176 176
 			}
177 177
 		}
@@ -263,9 +263,9 @@  discard block
 block discarded – undo
263 263
 	/* (non-PHPdoc)
264 264
 	 * @see \Ajax\bootstrap\html\base\BaseHtml::on()
265 265
 	 */
266
-	public function on($event, $jsCode, $stopPropagation = false, $preventDefault = false) {
267
-		foreach ($this->items as $item){
268
-			$item->on($event, $jsCode,$stopPropagation,$preventDefault);
266
+	public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) {
267
+		foreach ($this->items as $item) {
268
+			$item->on($event, $jsCode, $stopPropagation, $preventDefault);
269 269
 		}
270 270
 	}
271 271
 
Please login to merge, or discard this patch.
Braces   +12 added lines, -9 removed lines patch added patch discarded remove patch
@@ -89,7 +89,7 @@  discard block
 block discarded – undo
89 89
 	public function addItem($caption, $href="#") {
90 90
 		if($caption instanceof HtmlDropdownItem){
91 91
 			$item=$caption;
92
-		}else{
92
+		} else{
93 93
 			$iid=$this->getItemsCount()+1;
94 94
 			$item=new HtmlDropdownItem($this->identifier."-dropdown-item-".$iid);
95 95
 			$item->setCaption($caption)->setHref($href);
@@ -129,10 +129,11 @@  discard block
 block discarded – undo
129 129
 	 * @see BaseHtml::fromArray()
130 130
 	 */
131 131
 	public function fromArray($array) {
132
-		if (array_keys($array)!==range(0, count($array)-1))
133
-			return parent::fromArray($array);
134
-		else
135
-			return $this->addItems($array);
132
+		if (array_keys($array)!==range(0, count($array)-1)) {
133
+					return parent::fromArray($array);
134
+		} else {
135
+					return $this->addItems($array);
136
+		}
136 137
 	}
137 138
 
138 139
 	public function setItems($items) {
@@ -185,8 +186,9 @@  discard block
 block discarded – undo
185 186
 	 * @see \Ajax\bootstrap\html\BaseHtml::setTagName()
186 187
 	 */
187 188
 	public function setTagName($tagName) {
188
-		if ($tagName=="button")
189
-			$this->class="btn dropdown-toggle";
189
+		if ($tagName=="button") {
190
+					$this->class="btn dropdown-toggle";
191
+		}
190 192
 		return parent::setTagName($tagName);
191 193
 	}
192 194
 
@@ -204,8 +206,9 @@  discard block
 block discarded – undo
204 206
 	}
205 207
 
206 208
 	public function setAlignment($alignment) {
207
-		if (is_int($alignment))
208
-			$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
209
+		if (is_int($alignment)) {
210
+					$alignment="dropdown-menu-".CssRef::alignment()[$alignment];
211
+		}
209 212
 		return $this->addToMemberCtrl($this->class, $alignment, CssRef::alignment());
210 213
 	}
211 214
 
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlInput.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -32,12 +32,12 @@
 block discarded – undo
32 32
 	public function setLabel($label, $before=true) {
33 33
 		if ($before===true) {
34 34
 			$this->wrap("<label for='".$this->identifier."'>".$label."</label>", "");
35
-		} else {
35
+		}else {
36 36
 			$this->wrap("", "<label for='".$this->identifier."'>&nbsp;".$label."</label>");
37 37
 		}
38 38
 	}
39 39
 
40
-	public function setPlaceHolder($value){
40
+	public function setPlaceHolder($value) {
41 41
 		$this->setProperty("placeholder", $value);
42 42
 	}
43 43
 
Please login to merge, or discard this patch.
Ajax/bootstrap/html/HtmlInputgroup.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 		$span->setTagName("div");
71 71
 		$buttons=array();
72 72
 		$i=1;
73
-		foreach ($items as $item){
73
+		foreach ($items as $item) {
74 74
 			$bt=NULL;
75
-			if(is_string($item)){
76
-				$bt=new HtmlButton($this->identifier."-bt-".$i++,$item);
77
-			}elseif ($item instanceof HtmlButton){
75
+			if (is_string($item)) {
76
+				$bt=new HtmlButton($this->identifier."-bt-".$i++, $item);
77
+			}elseif ($item instanceof HtmlButton) {
78 78
 				$bt=$item;
79 79
 			}
80
-			if(isset($bt)){
80
+			if (isset($bt)) {
81 81
 				$buttons[]=$bt;
82 82
 			}
83 83
 		}
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public function setSize($size) {
121 121
 		if (is_int($size)) {
122
-			return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size],CssRef::sizes("input-group"));
122
+			return $this->addToMemberCtrl($this->mClass, CssRef::sizes("input-group")[$size], CssRef::sizes("input-group"));
123 123
 		}
124 124
 		return $this->addToMemberCtrl($this->mClass, $size, CssRef::sizes("input-group"));
125 125
 	}
Please login to merge, or discard this patch.
Braces   +17 added lines, -13 removed lines patch added patch discarded remove patch
@@ -28,10 +28,11 @@  discard block
 block discarded – undo
28 28
 		$this->setProperty("aria-describedby", $id);
29 29
 		$span->setContent($text);
30 30
 		$span->setClass("input-group-addon");
31
-		if (strtolower($position)==="left")
32
-			$this->addonLeft=$span;
33
-		else
34
-			$this->addonRight=$span;
31
+		if (strtolower($position)==="left") {
32
+					$this->addonLeft=$span;
33
+		} else {
34
+					$this->addonRight=$span;
35
+		}
35 36
 		return $span;
36 37
 	}
37 38
 
@@ -74,7 +75,7 @@  discard block
 block discarded – undo
74 75
 			$bt=NULL;
75 76
 			if(is_string($item)){
76 77
 				$bt=new HtmlButton($this->identifier."-bt-".$i++,$item);
77
-			}elseif ($item instanceof HtmlButton){
78
+			} elseif ($item instanceof HtmlButton){
78 79
 				$bt=$item;
79 80
 			}
80 81
 			if(isset($bt)){
@@ -88,10 +89,11 @@  discard block
 block discarded – undo
88 89
 		$dropdown->setBtnCaption($caption);
89 90
 		$dropdown->fromArray($items);
90 91
 
91
-		if (strtolower($position)==="left")
92
-			$this->addonLeft=$dropdown;
93
-		else
94
-			$this->addonRight=$dropdown;
92
+		if (strtolower($position)==="left") {
93
+					$this->addonLeft=$dropdown;
94
+		} else {
95
+					$this->addonRight=$dropdown;
96
+		}
95 97
 		return $dropdown;
96 98
 	}
97 99
 
@@ -126,10 +128,12 @@  discard block
 block discarded – undo
126 128
 
127 129
 	public function run(JsUtils $js) {
128 130
 		parent::run($js);
129
-		if (isset($this->addonLeft))
130
-			$this->addonLeft->run($js);
131
-		if (isset($this->addonRight))
132
-			$this->addonRight->run($js);
131
+		if (isset($this->addonLeft)) {
132
+					$this->addonLeft->run($js);
133
+		}
134
+		if (isset($this->addonRight)) {
135
+					$this->addonRight->run($js);
136
+		}
133 137
 	}
134 138
 
135 139
 }
136 140
\ No newline at end of file
Please login to merge, or discard this patch.