@@ -23,21 +23,21 @@ discard block |
||
23 | 23 | $this->parameters["immediatly"]=false; |
24 | 24 | extract($this->parameters); |
25 | 25 | $result=$this->_eventPreparing($preventDefault, $stopPropagation); |
26 | - switch($this->method) { |
|
26 | + switch ($this->method) { |
|
27 | 27 | case "get": |
28 | 28 | $result.=$js->getDeferred($url, $responseElement, $this->parameters); |
29 | 29 | break; |
30 | 30 | case "post": |
31 | - $result.=$js->postDeferred($url, $params,$responseElement, $this->parameters); |
|
31 | + $result.=$js->postDeferred($url, $params, $responseElement, $this->parameters); |
|
32 | 32 | break; |
33 | 33 | case "postForm": |
34 | 34 | $result.=$js->postFormDeferred($url, $form, $responseElement, $this->parameters); |
35 | 35 | break; |
36 | 36 | case "json": |
37 | - $result.=$js->jsonDeferred($url,$method,$this->parameters); |
|
37 | + $result.=$js->jsonDeferred($url, $method, $this->parameters); |
|
38 | 38 | break; |
39 | 39 | case "jsonArray": |
40 | - $result.=$js->jsonArrayDeferred($modelSelector, $url,$method,$this->parameters); |
|
40 | + $result.=$js->jsonArrayDeferred($modelSelector, $url, $method, $this->parameters); |
|
41 | 41 | break; |
42 | 42 | default: |
43 | 43 | //$result.=$js->ajax($this->method, $url,$responseElement,$this->parameters); |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | return $result; |
47 | 47 | } |
48 | 48 | |
49 | - protected function _eventPreparing($preventDefault,$stopPropagation){ |
|
49 | + protected function _eventPreparing($preventDefault, $stopPropagation) { |
|
50 | 50 | $result=""; |
51 | 51 | if ($preventDefault===true) { |
52 | 52 | $result.=Javascript::$preventDefault; |
@@ -14,8 +14,9 @@ |
||
14 | 14 | } |
15 | 15 | |
16 | 16 | public function compile(JsUtils $js=null) { |
17 | - if ($js===null) |
|
18 | - return; |
|
17 | + if ($js===null) { |
|
18 | + return; |
|
19 | + } |
|
19 | 20 | $params="{}"; |
20 | 21 | $stopPropagation=true; |
21 | 22 | $preventDefault=true; |
@@ -6,44 +6,44 @@ discard block |
||
6 | 6 | use Symfony\Component\HttpFoundation\Request; |
7 | 7 | use Symfony\Component\HttpKernel\HttpKernelInterface; |
8 | 8 | use Ajax\service\JString; |
9 | -class JsUtils extends \Ajax\JsUtils{ |
|
9 | +class JsUtils extends \Ajax\JsUtils { |
|
10 | 10 | |
11 | - public function getUrl($url){ |
|
11 | + public function getUrl($url) { |
|
12 | 12 | $router=$this->getInjected(); |
13 | - if(isset($router)){ |
|
13 | + if (isset($router)) { |
|
14 | 14 | try { |
15 | 15 | $url=$router->generate($url); |
16 | - }catch (\Exception $e){ |
|
16 | + }catch (\Exception $e) { |
|
17 | 17 | return $url; |
18 | 18 | } |
19 | 19 | } |
20 | 20 | return $url; |
21 | 21 | } |
22 | - public function addViewElement($identifier,$content,&$view){ |
|
23 | - if(\is_array($view)){ |
|
24 | - if(\array_key_exists("q", $view)===false){ |
|
22 | + public function addViewElement($identifier, $content, &$view) { |
|
23 | + if (\is_array($view)) { |
|
24 | + if (\array_key_exists("q", $view)===false) { |
|
25 | 25 | $view["q"]=array(); |
26 | 26 | } |
27 | 27 | $view["q"][$identifier]=$content; |
28 | - }elseif($view instanceof \Twig_Environment){ |
|
28 | + }elseif ($view instanceof \Twig_Environment) { |
|
29 | 29 | $vars=$view->getGlobals(); |
30 | - if(\array_key_exists("q", $vars)===false){ |
|
30 | + if (\array_key_exists("q", $vars)===false) { |
|
31 | 31 | $vars["q"]=array(); |
32 | 32 | } |
33 | 33 | $vars["q"][$identifier]=$content; |
34 | - $view->addGlobal("q",$vars["q"]); |
|
34 | + $view->addGlobal("q", $vars["q"]); |
|
35 | 35 | } |
36 | 36 | } |
37 | 37 | |
38 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
38 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
39 | 39 | $this->addVariable($view_var, $output, $view); |
40 | 40 | } |
41 | 41 | |
42 | - protected function addVariable($key,$value,&$view){ |
|
43 | - if(\is_array($view)){ |
|
42 | + protected function addVariable($key, $value, &$view) { |
|
43 | + if (\is_array($view)) { |
|
44 | 44 | $view[$key]=$value; |
45 | - }elseif($view instanceof \Twig_Environment){ |
|
46 | - $view->addGlobal($key,$value); |
|
45 | + }elseif ($view instanceof \Twig_Environment) { |
|
46 | + $view->addGlobal($key, $value); |
|
47 | 47 | } |
48 | 48 | } |
49 | 49 | |
@@ -54,17 +54,17 @@ discard block |
||
54 | 54 | * @param array $params |
55 | 55 | * @see \Ajax\JsUtils::forward() |
56 | 56 | */ |
57 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
57 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
58 | 58 | $path=$params; |
59 | - $request = $initialControllerInstance->get('request_stack')->getCurrentRequest(); |
|
60 | - $path['_forwarded'] = $request->attributes; |
|
61 | - $path['_controller'] = $controllerName.":".$actionName; |
|
62 | - $subRequest = $request->duplicate([], null, $path); |
|
63 | - $response= $initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST); |
|
59 | + $request=$initialControllerInstance->get('request_stack')->getCurrentRequest(); |
|
60 | + $path['_forwarded']=$request->attributes; |
|
61 | + $path['_controller']=$controllerName.":".$actionName; |
|
62 | + $subRequest=$request->duplicate([], null, $path); |
|
63 | + $response=$initialControllerInstance->get('http_kernel')->handle($subRequest, HttpKernelInterface::SUB_REQUEST); |
|
64 | 64 | return $response->getContent(); |
65 | 65 | } |
66 | 66 | |
67 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
67 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
68 | 68 | if ($initialControllerInstance->has('templating')) { |
69 | 69 | return $initialControllerInstance->get('templating')->render($viewName, $params); |
70 | 70 | } |
@@ -76,10 +76,10 @@ discard block |
||
76 | 76 | return $initialControllerInstance->get('twig')->render($viewName, $params); |
77 | 77 | } |
78 | 78 | |
79 | - public function fromDispatcher($dispatcher){ |
|
80 | - $request = $dispatcher->get('request_stack')->getCurrentRequest(); |
|
79 | + public function fromDispatcher($dispatcher) { |
|
80 | + $request=$dispatcher->get('request_stack')->getCurrentRequest(); |
|
81 | 81 | $uri=$request->getPathInfo(); |
82 | - if(JString::startswith($uri, "/")){ |
|
82 | + if (JString::startswith($uri, "/")) { |
|
83 | 83 | $uri=\substr($uri, 1); |
84 | 84 | } |
85 | 85 | return \explode("/", $uri); |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | if(isset($router)){ |
14 | 14 | try { |
15 | 15 | $url=$router->generate($url); |
16 | - }catch (\Exception $e){ |
|
16 | + } catch (\Exception $e){ |
|
17 | 17 | return $url; |
18 | 18 | } |
19 | 19 | } |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | $view["q"]=array(); |
26 | 26 | } |
27 | 27 | $view["q"][$identifier]=$content; |
28 | - }elseif($view instanceof \Twig_Environment){ |
|
28 | + } elseif($view instanceof \Twig_Environment){ |
|
29 | 29 | $vars=$view->getGlobals(); |
30 | 30 | if(\array_key_exists("q", $vars)===false){ |
31 | 31 | $vars["q"]=array(); |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | protected function addVariable($key,$value,&$view){ |
43 | 43 | if(\is_array($view)){ |
44 | 44 | $view[$key]=$value; |
45 | - }elseif($view instanceof \Twig_Environment){ |
|
45 | + } elseif($view instanceof \Twig_Environment){ |
|
46 | 46 | $view->addGlobal($key,$value); |
47 | 47 | } |
48 | 48 | } |
@@ -14,11 +14,11 @@ discard block |
||
14 | 14 | * @version 1.3 |
15 | 15 | */ |
16 | 16 | abstract class BaseHtml extends BaseWidget { |
17 | - use BaseHtmlEventsTrait,BaseHtmlPropertiesTrait; |
|
17 | + use BaseHtmlEventsTrait, BaseHtmlPropertiesTrait; |
|
18 | 18 | protected $_template; |
19 | 19 | protected $tagName; |
20 | - protected $_wrapBefore=array (); |
|
21 | - protected $_wrapAfter=array (); |
|
20 | + protected $_wrapBefore=array(); |
|
21 | + protected $_wrapAfter=array(); |
|
22 | 22 | protected $_bsComponent; |
23 | 23 | protected $_compiled=false; |
24 | 24 | protected $_postCompile; |
@@ -31,14 +31,14 @@ discard block |
||
31 | 31 | */ |
32 | 32 | abstract public function run(JsUtils $js); |
33 | 33 | |
34 | - private function _callSetter($setter,$key,$value,&$array){ |
|
34 | + private function _callSetter($setter, $key, $value, &$array) { |
|
35 | 35 | $result=false; |
36 | - if (method_exists($this, $setter) && substr($setter, 0, 1) !== "_") { |
|
36 | + if (method_exists($this, $setter) && substr($setter, 0, 1)!=="_") { |
|
37 | 37 | try { |
38 | 38 | $this->$setter($value); |
39 | 39 | unset($array[$key]); |
40 | 40 | $result=true; |
41 | - } catch ( \Exception $e ) { |
|
41 | + }catch (\Exception $e) { |
|
42 | 42 | $result=false; |
43 | 43 | } |
44 | 44 | } |
@@ -46,17 +46,17 @@ discard block |
||
46 | 46 | } |
47 | 47 | |
48 | 48 | protected function getTemplate(JsUtils $js=NULL) { |
49 | - return PropertyWrapper::wrap($this->_wrapBefore, $js) . $this->_template . PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
49 | + return PropertyWrapper::wrap($this->_wrapBefore, $js).$this->_template.PropertyWrapper::wrap($this->_wrapAfter, $js); |
|
50 | 50 | } |
51 | 51 | |
52 | 52 | protected function ctrl($name, $value, $typeCtrl) { |
53 | 53 | if (\is_array($typeCtrl)) { |
54 | - if (array_search($value, $typeCtrl) === false) { |
|
55 | - throw new \Exception("La valeur passée `" . $value . "` à la propriété `" . $name . "` ne fait pas partie des valeurs possibles : {" . implode(",", $typeCtrl) . "}"); |
|
54 | + if (array_search($value, $typeCtrl)===false) { |
|
55 | + throw new \Exception("La valeur passée `".$value."` à la propriété `".$name."` ne fait pas partie des valeurs possibles : {".implode(",", $typeCtrl)."}"); |
|
56 | 56 | } |
57 | 57 | } else { |
58 | 58 | if (!$typeCtrl($value)) { |
59 | - throw new \Exception("La fonction " . $typeCtrl . " a retourné faux pour l'affectation de la propriété " . $name); |
|
59 | + throw new \Exception("La fonction ".$typeCtrl." a retourné faux pour l'affectation de la propriété ".$name); |
|
60 | 60 | } |
61 | 61 | } |
62 | 62 | return true; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | |
66 | 66 | |
67 | 67 | protected function setMemberCtrl(&$name, $value, $typeCtrl) { |
68 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
68 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
69 | 69 | return $name=$value; |
70 | 70 | } |
71 | 71 | return $this; |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | protected function addToMemberUnique(&$name, $value, $typeCtrl, $separator=" ") { |
75 | 75 | if (\is_array($typeCtrl)) { |
76 | 76 | $this->removeOldValues($name, $typeCtrl); |
77 | - $name.=$separator . $value; |
|
77 | + $name.=$separator.$value; |
|
78 | 78 | } |
79 | 79 | return $this; |
80 | 80 | } |
@@ -82,17 +82,17 @@ discard block |
||
82 | 82 | |
83 | 83 | |
84 | 84 | protected function addToMemberCtrl(&$name, $value, $typeCtrl, $separator=" ") { |
85 | - if ($this->ctrl($name, $value, $typeCtrl) === true) { |
|
85 | + if ($this->ctrl($name, $value, $typeCtrl)===true) { |
|
86 | 86 | if (\is_array($typeCtrl)) { |
87 | 87 | $this->removeOldValues($name, $typeCtrl); |
88 | 88 | } |
89 | - $name.=$separator . $value; |
|
89 | + $name.=$separator.$value; |
|
90 | 90 | } |
91 | 91 | return $this; |
92 | 92 | } |
93 | 93 | |
94 | 94 | protected function addToMember(&$name, $value, $separator=" ") { |
95 | - $name=str_ireplace($value, "", $name) . $separator . $value; |
|
95 | + $name=str_ireplace($value, "", $name).$separator.$value; |
|
96 | 96 | return $this; |
97 | 97 | } |
98 | 98 | |
@@ -103,18 +103,18 @@ discard block |
||
103 | 103 | $oldValue=trim($oldValue); |
104 | 104 | } |
105 | 105 | |
106 | - protected function _getElementBy($callback,$elements){ |
|
106 | + protected function _getElementBy($callback, $elements) { |
|
107 | 107 | if (\is_array($elements)) { |
108 | 108 | $elements=\array_values($elements); |
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | - while ( !$flag && $index < sizeof($elements) ) { |
|
111 | + while (!$flag && $index<sizeof($elements)) { |
|
112 | 112 | if ($elements[$index] instanceof BaseHtml) |
113 | 113 | $flag=($callback($elements[$index])); |
114 | 114 | $index++; |
115 | 115 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
116 | + if ($flag===true) |
|
117 | + return $elements[$index-1]; |
|
118 | 118 | } elseif ($elements instanceof BaseHtml) { |
119 | 119 | if ($callback($elements)) |
120 | 120 | return $elements; |
@@ -142,13 +142,13 @@ discard block |
||
142 | 142 | } |
143 | 143 | |
144 | 144 | public function fromArray($array) { |
145 | - foreach ( $this as $key => $value ) { |
|
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
145 | + foreach ($this as $key => $value) { |
|
146 | + if (array_key_exists($key, $array)===true) |
|
147 | + $this->_callSetter("set".ucfirst($key), $key, $array[$key], $array); |
|
148 | 148 | } |
149 | - foreach ( $array as $key => $value ) { |
|
150 | - if($this->_callSetter($key, $key, $value, $array)===false){ |
|
151 | - $this->_callSetter("set" . ucfirst($key), $key, $value, $array); |
|
149 | + foreach ($array as $key => $value) { |
|
150 | + if ($this->_callSetter($key, $key, $value, $array)===false) { |
|
151 | + $this->_callSetter("set".ucfirst($key), $key, $value, $array); |
|
152 | 152 | } |
153 | 153 | } |
154 | 154 | return $array; |
@@ -156,7 +156,7 @@ discard block |
||
156 | 156 | |
157 | 157 | public function fromDatabaseObjects($objects, $function) { |
158 | 158 | if (isset($objects)) { |
159 | - foreach ( $objects as $object ) { |
|
159 | + foreach ($objects as $object) { |
|
160 | 160 | $this->fromDatabaseObject($object, $function); |
161 | 161 | } |
162 | 162 | } |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | |
178 | 178 | |
179 | 179 | public function getElementById($identifier, $elements) { |
180 | - return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier;}, $elements); |
|
180 | + return $this->_getElementBy(function(BaseWidget $element) use ($identifier){return $element->getIdentifier()===$identifier; }, $elements); |
|
181 | 181 | } |
182 | 182 | |
183 | 183 | public function getBsComponent() { |
@@ -190,14 +190,14 @@ discard block |
||
190 | 190 | } |
191 | 191 | |
192 | 192 | protected function compile_once(JsUtils $js=NULL, &$view=NULL) { |
193 | - if(!$this->_compiled){ |
|
194 | - if(isset($js)){ |
|
193 | + if (!$this->_compiled) { |
|
194 | + if (isset($js)) { |
|
195 | 195 | $beforeCompile=$js->getParam("beforeCompileHtml"); |
196 | - if(\is_callable($beforeCompile)){ |
|
197 | - $beforeCompile($this,$js,$view); |
|
196 | + if (\is_callable($beforeCompile)) { |
|
197 | + $beforeCompile($this, $js, $view); |
|
198 | 198 | } |
199 | 199 | } |
200 | - if(\is_callable($this->_preCompile)){ |
|
200 | + if (\is_callable($this->_preCompile)) { |
|
201 | 201 | $pc=$this->_preCompile; |
202 | 202 | $pc($this); |
203 | 203 | } |
@@ -207,15 +207,15 @@ discard block |
||
207 | 207 | } |
208 | 208 | |
209 | 209 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
210 | - $this->compile_once($js,$view); |
|
210 | + $this->compile_once($js, $view); |
|
211 | 211 | $result=$this->getTemplate($js); |
212 | - foreach ( $this as $key => $value ) { |
|
213 | - if(\strstr($result, "%{$key}%")!==false){ |
|
212 | + foreach ($this as $key => $value) { |
|
213 | + if (\strstr($result, "%{$key}%")!==false) { |
|
214 | 214 | if (\is_array($value)) { |
215 | 215 | $v=PropertyWrapper::wrap($value, $js); |
216 | - }elseif($value instanceof \stdClass){ |
|
217 | - $v=\print_r($value,true); |
|
218 | - }else{ |
|
216 | + }elseif ($value instanceof \stdClass) { |
|
217 | + $v=\print_r($value, true); |
|
218 | + } else { |
|
219 | 219 | $v=$value; |
220 | 220 | } |
221 | 221 | $result=str_replace("%{$key}%", $v, $result); |
@@ -223,12 +223,12 @@ discard block |
||
223 | 223 | } |
224 | 224 | if (isset($js)===true) { |
225 | 225 | $this->run($js); |
226 | - if (isset($view) === true) { |
|
226 | + if (isset($view)===true) { |
|
227 | 227 | $js->addViewElement($this->_identifier, $result, $view); |
228 | 228 | } |
229 | 229 | } |
230 | 230 | |
231 | - if(\is_callable($this->_postCompile)){ |
|
231 | + if (\is_callable($this->_postCompile)) { |
|
232 | 232 | $pc=$this->_postCompile; |
233 | 233 | $pc($this); |
234 | 234 | } |
@@ -239,11 +239,11 @@ discard block |
||
239 | 239 | return $this->compile(); |
240 | 240 | } |
241 | 241 | |
242 | - public function onPostCompile($callback){ |
|
242 | + public function onPostCompile($callback) { |
|
243 | 243 | $this->_postCompile=$callback; |
244 | 244 | } |
245 | 245 | |
246 | - public function onPreCompile($callback){ |
|
246 | + public function onPreCompile($callback) { |
|
247 | 247 | $this->_preCompile=$callback; |
248 | 248 | } |
249 | 249 | } |
@@ -109,15 +109,18 @@ discard block |
||
109 | 109 | $flag=false; |
110 | 110 | $index=0; |
111 | 111 | while ( !$flag && $index < sizeof($elements) ) { |
112 | - if ($elements[$index] instanceof BaseHtml) |
|
113 | - $flag=($callback($elements[$index])); |
|
112 | + if ($elements[$index] instanceof BaseHtml) { |
|
113 | + $flag=($callback($elements[$index])); |
|
114 | + } |
|
114 | 115 | $index++; |
115 | 116 | } |
116 | - if ($flag === true) |
|
117 | - return $elements[$index - 1]; |
|
117 | + if ($flag === true) { |
|
118 | + return $elements[$index - 1]; |
|
119 | + } |
|
118 | 120 | } elseif ($elements instanceof BaseHtml) { |
119 | - if ($callback($elements)) |
|
120 | - return $elements; |
|
121 | + if ($callback($elements)) { |
|
122 | + return $elements; |
|
123 | + } |
|
121 | 124 | } |
122 | 125 | return null; |
123 | 126 | } |
@@ -143,8 +146,9 @@ discard block |
||
143 | 146 | |
144 | 147 | public function fromArray($array) { |
145 | 148 | foreach ( $this as $key => $value ) { |
146 | - if(array_key_exists($key, $array)===true) |
|
147 | - $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
149 | + if(array_key_exists($key, $array)===true) { |
|
150 | + $this->_callSetter("set" . ucfirst($key), $key, $array[$key], $array); |
|
151 | + } |
|
148 | 152 | } |
149 | 153 | foreach ( $array as $key => $value ) { |
150 | 154 | if($this->_callSetter($key, $key, $value, $array)===false){ |
@@ -213,9 +217,9 @@ discard block |
||
213 | 217 | if(\strstr($result, "%{$key}%")!==false){ |
214 | 218 | if (\is_array($value)) { |
215 | 219 | $v=PropertyWrapper::wrap($value, $js); |
216 | - }elseif($value instanceof \stdClass){ |
|
220 | + } elseif($value instanceof \stdClass){ |
|
217 | 221 | $v=\print_r($value,true); |
218 | - }else{ |
|
222 | + } else{ |
|
219 | 223 | $v=$value; |
220 | 224 | } |
221 | 225 | $result=str_replace("%{$key}%", $v, $result); |
@@ -12,8 +12,8 @@ discard block |
||
12 | 12 | } |
13 | 13 | $output=""; |
14 | 14 | if (\is_array($input)) { |
15 | - if (sizeof($input) > 0) { |
|
16 | - if (self::containsElement($input) === false) { |
|
15 | + if (sizeof($input)>0) { |
|
16 | + if (self::containsElement($input)===false) { |
|
17 | 17 | $output=self::wrapStrings($input, $separator=' ', $valueQuote='"'); |
18 | 18 | } else { |
19 | 19 | $output=self::wrapObjects($input, $js, $separator, $valueQuote); |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | } |
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | - foreach ( $input as $v ) { |
|
27 | + foreach ($input as $v) { |
|
28 | 28 | if (\is_object($v) || \is_array($v)) |
29 | 29 | return true; |
30 | 30 | } |
@@ -32,9 +32,9 @@ discard block |
||
32 | 32 | } |
33 | 33 | |
34 | 34 | public static function wrapStrings($input, $separator=' ', $valueQuote='"') { |
35 | - if (JArray::isAssociative($input) === true) { |
|
36 | - $result=implode($separator, array_map(function ($v, $k) use($valueQuote) { |
|
37 | - return $k . '=' . $valueQuote . $v . $valueQuote; |
|
35 | + if (JArray::isAssociative($input)===true) { |
|
36 | + $result=implode($separator, array_map(function($v, $k) use($valueQuote) { |
|
37 | + return $k.'='.$valueQuote.$v.$valueQuote; |
|
38 | 38 | }, $input, array_keys($input))); |
39 | 39 | } else { |
40 | 40 | $result=implode($separator, $input); |
@@ -43,17 +43,17 @@ discard block |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public static function wrapObjects($input, $js=NULL, $separator=' ', $valueQuote='"') { |
46 | - return implode($separator, array_map(function ($v) use($js, $separator, $valueQuote) { |
|
47 | - if(\is_string($v)){ |
|
46 | + return implode($separator, array_map(function($v) use($js, $separator, $valueQuote) { |
|
47 | + if (\is_string($v)) { |
|
48 | 48 | return $v; |
49 | 49 | } |
50 | - if ($v instanceof BaseHtml){ |
|
50 | + if ($v instanceof BaseHtml) { |
|
51 | 51 | return $v->compile($js); |
52 | 52 | } |
53 | 53 | if (\is_array($v)) { |
54 | 54 | return self::wrap($v, $js, $separator, $valueQuote); |
55 | 55 | } |
56 | - if(!\is_callable($v)){ |
|
56 | + if (!\is_callable($v)) { |
|
57 | 57 | return $v; |
58 | 58 | } |
59 | 59 | }, $input)); |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | return $result;*/ |
72 | 72 | } |
73 | 73 | |
74 | - protected static function wrapValue($value,$js=NULL, $separator=' ', $valueQuote='"'){ |
|
74 | + protected static function wrapValue($value, $js=NULL, $separator=' ', $valueQuote='"') { |
|
75 | 75 | if (\is_array($value)) { |
76 | 76 | return self::wrap($value, $js, $separator, $valueQuote); |
77 | 77 | } |
78 | - if ($value instanceof BaseHtml){ |
|
78 | + if ($value instanceof BaseHtml) { |
|
79 | 79 | return $value->compile($js); |
80 | 80 | } |
81 | - if(!\is_callable($value)){ |
|
81 | + if (!\is_callable($value)) { |
|
82 | 82 | return $value; |
83 | 83 | } |
84 | 84 | return ''; |
@@ -25,8 +25,9 @@ |
||
25 | 25 | |
26 | 26 | private static function containsElement($input) { |
27 | 27 | foreach ( $input as $v ) { |
28 | - if (\is_object($v) || \is_array($v)) |
|
29 | - return true; |
|
28 | + if (\is_object($v) || \is_array($v)) { |
|
29 | + return true; |
|
30 | + } |
|
30 | 31 | } |
31 | 32 | return false; |
32 | 33 | } |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | namespace Ajax\common\traits; |
3 | 3 | use Ajax\common\BaseGui; |
4 | 4 | |
5 | -trait JsUtilsInternalTrait{ |
|
5 | +trait JsUtilsInternalTrait { |
|
6 | 6 | |
7 | - protected $jquery_code_for_compile=array (); |
|
8 | - protected $jquery_code_for_compile_at_last=array (); |
|
7 | + protected $jquery_code_for_compile=array(); |
|
8 | + protected $jquery_code_for_compile_at_last=array(); |
|
9 | 9 | |
10 | 10 | protected function _addToCompile($jsScript) { |
11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,28 +15,28 @@ discard block |
||
15 | 15 | * @param BaseGui $library |
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | - protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
|
19 | - if(isset($view)) |
|
18 | + protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) { |
|
19 | + if (isset($view)) |
|
20 | 20 | $library->compileHtml($this, $view); |
21 | 21 | if ($library->isAutoCompile()) { |
22 | 22 | $library->compile(true); |
23 | 23 | } |
24 | 24 | } |
25 | 25 | |
26 | - protected function defer($script){ |
|
26 | + protected function defer($script) { |
|
27 | 27 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
28 | 28 | $result.="window.defer(function(){".$script."})"; |
29 | 29 | return $result; |
30 | 30 | } |
31 | 31 | |
32 | - protected function ready($script){ |
|
32 | + protected function ready($script) { |
|
33 | 33 | $result='$(document).ready(function() {'."\n"; |
34 | 34 | $result.=$script.'})'; |
35 | 35 | return $result; |
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
39 | + if (trim($input)==="") return $input; |
|
40 | 40 | return preg_replace( |
41 | 41 | array( |
42 | 42 | // Remove comment(s) |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | 18 | protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
19 | - if(isset($view)) |
|
20 | - $library->compileHtml($this, $view); |
|
19 | + if(isset($view)) { |
|
20 | + $library->compileHtml($this, $view); |
|
21 | + } |
|
21 | 22 | if ($library->isAutoCompile()) { |
22 | 23 | $library->compile(true); |
23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
36 | 37 | } |
37 | 38 | |
38 | 39 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | + if(trim($input) === "") { |
|
41 | + return $input; |
|
42 | + } |
|
40 | 43 | return preg_replace( |
41 | 44 | array( |
42 | 45 | // Remove comment(s) |
@@ -120,25 +120,29 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function getColPosition($colIndex) { |
123 | - if($this->_container->_isMerged()!==true) |
|
124 | - return $colIndex; |
|
123 | + if($this->_container->_isMerged()!==true) { |
|
124 | + return $colIndex; |
|
125 | + } |
|
125 | 126 | $pos=0; |
126 | 127 | $rows=$this->_container->getContent(); |
127 | 128 | for($i=0; $i < $this->_row; $i++) { |
128 | 129 | $max=\min($colIndex, $rows[$i]->count()); |
129 | 130 | for($j=0; $j < $max; $j++) { |
130 | 131 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
131 | - if ($rowspan + $i > $this->_row) |
|
132 | - $pos++; |
|
132 | + if ($rowspan + $i > $this->_row) { |
|
133 | + $pos++; |
|
134 | + } |
|
133 | 135 | } |
134 | 136 | } |
135 | - if ($pos > $colIndex) |
|
136 | - return NULL; |
|
137 | + if ($pos > $colIndex) { |
|
138 | + return NULL; |
|
139 | + } |
|
137 | 140 | $count=$this->count(); |
138 | 141 | for($i=0; $i < $count; $i++) { |
139 | 142 | $pos+=$this->content[$i]->getColspan(); |
140 | - if ($pos >= $colIndex + 1) |
|
141 | - return $i; |
|
143 | + if ($pos >= $colIndex + 1) { |
|
144 | + return $i; |
|
145 | + } |
|
142 | 146 | } |
143 | 147 | return null; |
144 | 148 | } |
@@ -161,8 +165,9 @@ discard block |
||
161 | 165 | public function containsStr($needle) { |
162 | 166 | $cells=$this->content; |
163 | 167 | foreach ( $cells as $cell ) { |
164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
165 | - return true; |
|
168 | + if (\strpos($cell->getContent(), $needle) !== false) { |
|
169 | + return true; |
|
170 | + } |
|
166 | 171 | } |
167 | 172 | return false; |
168 | 173 | } |
@@ -20,19 +20,19 @@ discard block |
||
20 | 20 | |
21 | 21 | public function __construct($identifier) { |
22 | 22 | parent::__construct($identifier, "tr", ""); |
23 | - $this->_states=[ State::ACTIVE,State::POSITIVE,State::NEGATIVE,State::WARNING,State::ERROR,State::DISABLED ]; |
|
23 | + $this->_states=[State::ACTIVE, State::POSITIVE, State::NEGATIVE, State::WARNING, State::ERROR, State::DISABLED]; |
|
24 | 24 | } |
25 | 25 | |
26 | 26 | public function setColCount($colCount) { |
27 | 27 | $count=$this->count(); |
28 | - for($i=$count; $i < $colCount; $i++) { |
|
28 | + for ($i=$count; $i<$colCount; $i++) { |
|
29 | 29 | $item=$this->addItem(NULL); |
30 | 30 | $item->setTagName($this->_tdTagName); |
31 | 31 | } |
32 | 32 | return $this; |
33 | 33 | } |
34 | 34 | |
35 | - public function getColCount(){ |
|
35 | + public function getColCount() { |
|
36 | 36 | return $this->count(); |
37 | 37 | } |
38 | 38 | |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | * @param mixed $values |
69 | 69 | */ |
70 | 70 | public function setValues($values=array()) { |
71 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->setValue($value);}); |
|
71 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->setValue($value); }); |
|
72 | 72 | } |
73 | 73 | |
74 | 74 | /** |
@@ -76,27 +76,27 @@ discard block |
||
76 | 76 | * @param mixed $values |
77 | 77 | */ |
78 | 78 | public function addValues($values=array()) { |
79 | - return $this->_addOrSetValues($values, function(HtmlTD &$cell,$value){$cell->addValue($value);}); |
|
79 | + return $this->_addOrSetValues($values, function(HtmlTD &$cell, $value) {$cell->addValue($value); }); |
|
80 | 80 | } |
81 | 81 | |
82 | 82 | /** |
83 | 83 | * Sets or adds values to the row cols |
84 | 84 | * @param mixed $values |
85 | 85 | */ |
86 | - protected function _addOrSetValues($values,$callback) { |
|
86 | + protected function _addOrSetValues($values, $callback) { |
|
87 | 87 | $count=$this->count(); |
88 | 88 | if (!\is_array($values)) { |
89 | 89 | $values=\array_fill(0, $count, $values); |
90 | 90 | } else { |
91 | - if (JArray::isAssociative($values) === true) { |
|
91 | + if (JArray::isAssociative($values)===true) { |
|
92 | 92 | $values=\array_values($values); |
93 | 93 | } |
94 | 94 | } |
95 | 95 | $count=\min(\sizeof($values), $count); |
96 | 96 | |
97 | - for($i=0; $i < $count; $i++) { |
|
97 | + for ($i=0; $i<$count; $i++) { |
|
98 | 98 | $cell=$this->content[$i]; |
99 | - $callback($cell,$values[$i]); |
|
99 | + $callback($cell, $values[$i]); |
|
100 | 100 | } |
101 | 101 | return $this; |
102 | 102 | } |
@@ -120,24 +120,24 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function getColPosition($colIndex) { |
123 | - if($this->_container->_isMerged()!==true) |
|
123 | + if ($this->_container->_isMerged()!==true) |
|
124 | 124 | return $colIndex; |
125 | 125 | $pos=0; |
126 | 126 | $rows=$this->_container->getContent(); |
127 | - for($i=0; $i < $this->_row; $i++) { |
|
127 | + for ($i=0; $i<$this->_row; $i++) { |
|
128 | 128 | $max=\min($colIndex, $rows[$i]->count()); |
129 | - for($j=0; $j < $max; $j++) { |
|
129 | + for ($j=0; $j<$max; $j++) { |
|
130 | 130 | $rowspan=$rows[$i]->getItem($j)->getRowspan(); |
131 | - if ($rowspan + $i > $this->_row) |
|
131 | + if ($rowspan+$i>$this->_row) |
|
132 | 132 | $pos++; |
133 | 133 | } |
134 | 134 | } |
135 | - if ($pos > $colIndex) |
|
135 | + if ($pos>$colIndex) |
|
136 | 136 | return NULL; |
137 | 137 | $count=$this->count(); |
138 | - for($i=0; $i < $count; $i++) { |
|
138 | + for ($i=0; $i<$count; $i++) { |
|
139 | 139 | $pos+=$this->content[$i]->getColspan(); |
140 | - if ($pos >= $colIndex + 1) |
|
140 | + if ($pos>=$colIndex+1) |
|
141 | 141 | return $i; |
142 | 142 | } |
143 | 143 | return null; |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | |
146 | 146 | public function conditionalCellFormat($callback, $format) { |
147 | 147 | $cells=$this->content; |
148 | - foreach ( $cells as $cell ) { |
|
148 | + foreach ($cells as $cell) { |
|
149 | 149 | $cell->conditionalCellFormat($callback, $format); |
150 | 150 | } |
151 | 151 | return $this; |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | |
161 | 161 | public function containsStr($needle) { |
162 | 162 | $cells=$this->content; |
163 | - foreach ( $cells as $cell ) { |
|
164 | - if (\strpos($cell->getContent(), $needle) !== false) |
|
163 | + foreach ($cells as $cell) { |
|
164 | + if (\strpos($cell->getContent(), $needle)!==false) |
|
165 | 165 | return true; |
166 | 166 | } |
167 | 167 | return false; |
@@ -174,13 +174,13 @@ discard block |
||
174 | 174 | |
175 | 175 | public function applyCells($callback) { |
176 | 176 | $cells=$this->content; |
177 | - foreach ( $cells as $cell ) { |
|
177 | + foreach ($cells as $cell) { |
|
178 | 178 | $cell->apply($callback); |
179 | 179 | } |
180 | 180 | return $this; |
181 | 181 | } |
182 | 182 | |
183 | - public function toDelete($colIndex){ |
|
183 | + public function toDelete($colIndex) { |
|
184 | 184 | $this->getItem($colIndex)->toDelete(); |
185 | 185 | return $this; |
186 | 186 | } |
@@ -12,13 +12,13 @@ |
||
12 | 12 | * @param array $parameters |
13 | 13 | * @return Response |
14 | 14 | */ |
15 | - public function renderView($viewName,$parameters=[]){ |
|
15 | + public function renderView($viewName, $parameters=[]) { |
|
16 | 16 | $twig=$this->container->get("twig"); |
17 | 17 | $this->compile($parameters); |
18 | 18 | return new Response($twig->render($viewName, $parameters)); |
19 | 19 | } |
20 | 20 | |
21 | - public function generateUrl($path){ |
|
21 | + public function generateUrl($path) { |
|
22 | 22 | $request=Request::createFromGlobals(); |
23 | 23 | return $request->getBaseUrl().$path; |
24 | 24 | } |
@@ -6,8 +6,8 @@ |
||
6 | 6 | |
7 | 7 | class JquerySemantic extends Jquery_ { |
8 | 8 | |
9 | - public function __construct(RouterInterface $router,ContainerInterface $container ){ |
|
10 | - parent::__construct(["semantic"=>true,"defer"=>true],$router); |
|
9 | + public function __construct(RouterInterface $router, ContainerInterface $container) { |
|
10 | + parent::__construct(["semantic"=>true, "defer"=>true], $router); |
|
11 | 11 | $this->container=$container; |
12 | 12 | } |
13 | 13 | } |
@@ -6,8 +6,8 @@ |
||
6 | 6 | |
7 | 7 | class JqueryBootstrap extends Jquery_ { |
8 | 8 | |
9 | - public function __construct(RouterInterface $router,ContainerInterface $container ){ |
|
10 | - parent::__construct(["bootstrap"=>true,"defer"=>true],$router); |
|
9 | + public function __construct(RouterInterface $router, ContainerInterface $container) { |
|
10 | + parent::__construct(["bootstrap"=>true, "defer"=>true], $router); |
|
11 | 11 | $this->container=$container; |
12 | 12 | } |
13 | 13 | } |