@@ -121,7 +121,6 @@ discard block |
||
121 | 121 | /** |
122 | 122 | * render the content of $controller::$action and set the response to the modal content |
123 | 123 | * @param JsUtils $js |
124 | - * @param string $title The panel title |
|
125 | 124 | * @param Controller $initialControllerInstance |
126 | 125 | * @param string $controllerName the controller name |
127 | 126 | * @param string $actionName the action name |
@@ -198,7 +197,7 @@ discard block |
||
198 | 197 | * Includes a modal-backdrop element. |
199 | 198 | * Alternatively, specify static for a backdrop which doesn't close the modal on click. |
200 | 199 | * @param Boolean $value default : true |
201 | - * @return HtmlModal |
|
200 | + * @return boolean |
|
202 | 201 | */ |
203 | 202 | public function setBackdrop($value) { |
204 | 203 | return $this->backdrop=$value; |
@@ -14,6 +14,9 @@ discard block |
||
14 | 14 | protected $_params=array(); |
15 | 15 | protected $_paramParts=array(); |
16 | 16 | |
17 | + /** |
|
18 | + * @param string $identifier |
|
19 | + */ |
|
17 | 20 | public function __construct($identifier, $header="", $content="", $actions=array()) { |
18 | 21 | parent::__construct($identifier, "div","ui modal"); |
19 | 22 | if(isset($header)){ |
@@ -27,6 +30,9 @@ discard block |
||
27 | 30 | } |
28 | 31 | } |
29 | 32 | |
33 | + /** |
|
34 | + * @param string $value |
|
35 | + */ |
|
30 | 36 | public function setHeader($value) { |
31 | 37 | $this->content["header"]=new HtmlSemDoubleElement("header-" . $this->identifier, "a", "header", $value); |
32 | 38 | return $this; |
@@ -103,6 +109,9 @@ discard block |
||
103 | 109 | return $this->addElementInPart(new HtmlSemDoubleElement($part."-" . $this->identifier, "div", $uiClass, $content), $part); |
104 | 110 | } |
105 | 111 | |
112 | + /** |
|
113 | + * @param BaseHtml $element |
|
114 | + */ |
|
106 | 115 | private function addElementInPart($element,$part) { |
107 | 116 | $this->content[$part]->addContent($element); |
108 | 117 | return $element; |
@@ -141,7 +150,6 @@ discard block |
||
141 | 150 | /** |
142 | 151 | * render the content of $controller::$action and set the response to the modal content |
143 | 152 | * @param JsUtils $js |
144 | - * @param string $title The panel title |
|
145 | 153 | * @param Controller $initialControllerInstance |
146 | 154 | * @param string $controllerName the controller name |
147 | 155 | * @param string $actionName the action name |
@@ -43,8 +43,7 @@ discard block |
||
43 | 43 | foreach ($actions as $action){ |
44 | 44 | $this->addAction($action); |
45 | 45 | } |
46 | - } |
|
47 | - else{ |
|
46 | + } else{ |
|
48 | 47 | $this->addAction($actions); |
49 | 48 | } |
50 | 49 | return $this; |
@@ -60,8 +59,9 @@ discard block |
||
60 | 59 | $class="cancel"; |
61 | 60 | } |
62 | 61 | $action=new HtmlButton("action-".$this->identifier,$action); |
63 | - if($class!=="") |
|
64 | - $action->addToProperty("class", $class); |
|
62 | + if($class!=="") { |
|
63 | + $action->addToProperty("class", $class); |
|
64 | + } |
|
65 | 65 | } |
66 | 66 | return $this->addElementInPart($action, "actions"); |
67 | 67 | } |
@@ -165,8 +165,9 @@ discard block |
||
165 | 165 | * @see BaseHtml::run() |
166 | 166 | */ |
167 | 167 | public function run(JsUtils $js) { |
168 | - if(isset($this->_bsComponent)===false) |
|
169 | - $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
168 | + if(isset($this->_bsComponent)===false) { |
|
169 | + $this->_bsComponent=$js->semantic()->modal("#".$this->identifier,$this->_params,$this->_paramParts); |
|
170 | + } |
|
170 | 171 | $this->addEventsOnRun($js); |
171 | 172 | return $this->_bsComponent; |
172 | 173 | } |
@@ -59,6 +59,9 @@ discard block |
||
59 | 59 | return $this->addComponent(new Accordion($this->js), $attachTo, $params); |
60 | 60 | } |
61 | 61 | |
62 | + /** |
|
63 | + * @param string $attachTo |
|
64 | + */ |
|
62 | 65 | public function sticky($attachTo=NULL, $params=NULL) { |
63 | 66 | return $this->addComponent(new Sticky($this->js), $attachTo, $params); |
64 | 67 | } |
@@ -67,22 +70,37 @@ discard block |
||
67 | 70 | return $this->addComponent(new Checkbox($this->js), $attachTo, $params); |
68 | 71 | } |
69 | 72 | |
73 | + /** |
|
74 | + * @param string $attachTo |
|
75 | + */ |
|
70 | 76 | public function rating($attachTo=NULL, $params=NULL) { |
71 | 77 | return $this->addComponent(new Rating($this->js), $attachTo, $params); |
72 | 78 | } |
73 | 79 | |
80 | + /** |
|
81 | + * @param string $attachTo |
|
82 | + */ |
|
74 | 83 | public function progress($attachTo=NULL, $params=NULL) { |
75 | 84 | return $this->addComponent(new Progress($this->js), $attachTo, $params); |
76 | 85 | } |
77 | 86 | |
87 | + /** |
|
88 | + * @param string $attachTo |
|
89 | + */ |
|
78 | 90 | public function search($attachTo=NULL, $params=NULL) { |
79 | 91 | return $this->addComponent(new Search($this->js), $attachTo, $params); |
80 | 92 | } |
81 | 93 | |
94 | + /** |
|
95 | + * @param string $attachTo |
|
96 | + */ |
|
82 | 97 | public function dimmer($attachTo=NULL, $params=NULL) { |
83 | 98 | return $this->addComponent(new Dimmer($this->js), $attachTo, $params); |
84 | 99 | } |
85 | 100 | |
101 | + /** |
|
102 | + * @param string $attachTo |
|
103 | + */ |
|
86 | 104 | public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
87 | 105 | $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
88 | 106 | $result->setParamParts($paramsParts); |
@@ -181,9 +181,9 @@ |
||
181 | 181 | protected function createItem($value) { |
182 | 182 | $count=$this->count(); |
183 | 183 | $itemO=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "a", "section"); |
184 | - if (\is_array($value)) |
|
185 | - $itemO->fromArray($value); |
|
186 | - else { |
|
184 | + if (\is_array($value)) { |
|
185 | + $itemO->fromArray($value); |
|
186 | + } else { |
|
187 | 187 | $itemO->setContent($value); |
188 | 188 | } |
189 | 189 | return $itemO; |
@@ -147,10 +147,12 @@ discard block |
||
147 | 147 | if (isset($param)) { |
148 | 148 | $param=$this->_prep_value($param); |
149 | 149 | $str="$({$element}).{$jQueryCall}({$param});"; |
150 | - } else |
|
151 | - $str="$({$element}).{$jQueryCall}();"; |
|
152 | - if ($immediatly) |
|
153 | - $this->jquery_code_for_compile[]=$str; |
|
150 | + } else { |
|
151 | + $str="$({$element}).{$jQueryCall}();"; |
|
152 | + } |
|
153 | + if ($immediatly) { |
|
154 | + $this->jquery_code_for_compile[]=$str; |
|
155 | + } |
|
154 | 156 | return $str; |
155 | 157 | } |
156 | 158 | /** |
@@ -165,8 +167,9 @@ discard block |
||
165 | 167 | $to=$this->_prep_element($to); |
166 | 168 | $element=$this->_prep_element($element); |
167 | 169 | $str="$({$to}).{$jQueryCall}({$element});"; |
168 | - if ($immediatly) |
|
169 | - $this->jquery_code_for_compile[]=$str; |
|
170 | + if ($immediatly) { |
|
171 | + $this->jquery_code_for_compile[]=$str; |
|
172 | + } |
|
170 | 173 | return $str; |
171 | 174 | } |
172 | 175 | |
@@ -222,12 +225,14 @@ discard block |
||
222 | 225 | if ($stopPropagation===true) { |
223 | 226 | $js="event.stopPropagation();\n".$js; |
224 | 227 | } |
225 | - if (array_search($event, $this->jquery_events)===false) |
|
226 | - $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
227 | - else |
|
228 | - $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
229 | - if($immediatly) |
|
230 | - $this->jquery_code_for_compile[]=$event; |
|
228 | + if (array_search($event, $this->jquery_events)===false) { |
|
229 | + $event="\n\t$(".$this->_prep_element($element).").bind('{$event}',function(event){\n\t\t{$js}\n\t});\n"; |
|
230 | + } else { |
|
231 | + $event="\n\t$(".$this->_prep_element($element).").{$event}(function(event){\n\t\t{$js}\n\t});\n"; |
|
232 | + } |
|
233 | + if($immediatly) { |
|
234 | + $this->jquery_code_for_compile[]=$event; |
|
235 | + } |
|
231 | 236 | return $event; |
232 | 237 | } |
233 | 238 | |
@@ -355,7 +360,9 @@ discard block |
||
355 | 360 | } |
356 | 361 | |
357 | 362 | private function minify($input) { |
358 | - if(trim($input) === "") return $input; |
|
363 | + if(trim($input) === "") { |
|
364 | + return $input; |
|
365 | + } |
|
359 | 366 | return preg_replace( |
360 | 367 | array( |
361 | 368 | // Remove comment(s) |
@@ -41,8 +41,9 @@ discard block |
||
41 | 41 | } |
42 | 42 | $retour.="$.".$method."(url,".$params.").done(function( data ) {\n"; |
43 | 43 | $retour.=$this->_getOnAjaxDone($responseElement, $jsCallback)."});\n"; |
44 | - if ($immediatly) |
|
45 | - $this->jquery_code_for_compile[]=$retour; |
|
44 | + if ($immediatly) { |
|
45 | + $this->jquery_code_for_compile[]=$retour; |
|
46 | + } |
|
46 | 47 | return $retour; |
47 | 48 | } |
48 | 49 | |
@@ -50,13 +51,15 @@ discard block |
||
50 | 51 | $url=$this->_correctAjaxUrl($url); |
51 | 52 | $retour="url='".$url."';\n"; |
52 | 53 | $slash="/"; |
53 | - if(JString::endswith($url, "/")===true) |
|
54 | - $slash=""; |
|
54 | + if(JString::endswith($url, "/")===true) { |
|
55 | + $slash=""; |
|
56 | + } |
|
55 | 57 | if(JString::isNotNull($attr)){ |
56 | - if ($attr=="value") |
|
57 | - $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
58 | - else if($attr!=null && $attr!=="") |
|
59 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
58 | + if ($attr=="value") { |
|
59 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
60 | + } else if($attr!=null && $attr!=="") { |
|
61 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
62 | + } |
|
60 | 63 | } |
61 | 64 | return $retour; |
62 | 65 | } |
@@ -78,8 +81,9 @@ discard block |
||
78 | 81 | } |
79 | 82 | |
80 | 83 | protected function _correctAjaxUrl($url) { |
81 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
82 | - $url=substr($url, 0, strlen($url)-1); |
|
84 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
85 | + $url=substr($url, 0, strlen($url)-1); |
|
86 | + } |
|
83 | 87 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
84 | 88 | $url=$this->jsUtils->getUrl($url); |
85 | 89 | } |
@@ -103,8 +107,9 @@ discard block |
||
103 | 107 | $retour.="\t".$jsCallback."\n". |
104 | 108 | "\t$(document).trigger('jsonReady',[data]);\n". |
105 | 109 | "});\n"; |
106 | - if ($immediatly) |
|
107 | - $this->jquery_code_for_compile[]=$retour; |
|
110 | + if ($immediatly) { |
|
111 | + $this->jquery_code_for_compile[]=$retour; |
|
112 | + } |
|
108 | 113 | return $retour; |
109 | 114 | } |
110 | 115 | |
@@ -143,7 +148,7 @@ discard block |
||
143 | 148 | if($context===null){ |
144 | 149 | $appendTo="\t\tnewElm.appendTo($('".$maskSelector."').parent());\n"; |
145 | 150 | $newElm = "$('#'+newId)"; |
146 | - }else{ |
|
151 | + } else{ |
|
147 | 152 | $appendTo="\t\tnewElm.appendTo(".$context.");\n"; |
148 | 153 | $newElm = $context.".find('#'+newId)"; |
149 | 154 | } |
@@ -153,8 +158,9 @@ discard block |
||
153 | 158 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('[['+key+']]')>-1){\n"."\t\t\t\tcontent=$(html.split('[['+key+']]').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
154 | 159 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
155 | 160 | $retour.="\t".$jsCallback."\n"."});\n"; |
156 | - if ($immediatly) |
|
157 | - $this->jquery_code_for_compile[]=$retour; |
|
161 | + if ($immediatly) { |
|
162 | + $this->jquery_code_for_compile[]=$retour; |
|
163 | + } |
|
158 | 164 | return $retour; |
159 | 165 | } |
160 | 166 | /** |
@@ -195,8 +201,9 @@ discard block |
||
195 | 201 | }});\n"; |
196 | 202 | $retour.="$('#".$form."').submit();\n"; |
197 | 203 | } |
198 | - if ($immediatly) |
|
199 | - $this->jquery_code_for_compile[]=$retour; |
|
204 | + if ($immediatly) { |
|
205 | + $this->jquery_code_for_compile[]=$retour; |
|
206 | + } |
|
200 | 207 | return $retour; |
201 | 208 | } |
202 | 209 |
@@ -13,7 +13,7 @@ |
||
13 | 13 | if(isset($router)===true){ |
14 | 14 | try { |
15 | 15 | $url=$router->generate($url); |
16 | - }catch (\Exception $e){ |
|
16 | + } catch (\Exception $e){ |
|
17 | 17 | return $router->getContext()->getBaseUrl(); |
18 | 18 | } |
19 | 19 | } |