@@ -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; |
@@ -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); |
@@ -4,34 +4,34 @@ |
||
4 | 4 | |
5 | 5 | use Ubiquity\controllers\Startup; |
6 | 6 | use Ubiquity\utils\RequestUtils; |
7 | -class JsUtils extends \Ajax\JsUtils{ |
|
7 | +class JsUtils extends \Ajax\JsUtils { |
|
8 | 8 | |
9 | - public function getUrl($url){ |
|
9 | + public function getUrl($url) { |
|
10 | 10 | return RequestUtils::getUrl($url); |
11 | 11 | } |
12 | 12 | |
13 | - public function addViewElement($identifier,$content,&$view){ |
|
13 | + public function addViewElement($identifier, $content, &$view) { |
|
14 | 14 | $controls=$view->getVar("q"); |
15 | - if (isset($controls) === false) { |
|
16 | - $controls=array (); |
|
15 | + if (isset($controls)===false) { |
|
16 | + $controls=array(); |
|
17 | 17 | } |
18 | 18 | $controls[$identifier]=$content; |
19 | 19 | $view->setVar("q", $controls); |
20 | 20 | } |
21 | 21 | |
22 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
23 | - $view->setVar($view_var,$output); |
|
22 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
23 | + $view->setVar($view_var, $output); |
|
24 | 24 | } |
25 | 25 | |
26 | - public function forward($initialController,$controller,$action,$params=array()){ |
|
27 | - return $initialController->forward($controller,$action,$params,true,true,true); |
|
26 | + public function forward($initialController, $controller, $action, $params=array()) { |
|
27 | + return $initialController->forward($controller, $action, $params, true, true, true); |
|
28 | 28 | } |
29 | 29 | |
30 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
31 | - return $initialControllerInstance->loadView($viewName,$params,true); |
|
30 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
31 | + return $initialControllerInstance->loadView($viewName, $params, true); |
|
32 | 32 | } |
33 | 33 | |
34 | - public function fromDispatcher($dispatcher){ |
|
34 | + public function fromDispatcher($dispatcher) { |
|
35 | 35 | return Startup::$urlParts; |
36 | 36 | } |
37 | 37 | } |
@@ -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 | } |
@@ -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 ''; |
@@ -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) |
@@ -11,7 +11,7 @@ discard block |
||
11 | 11 | * |
12 | 12 | */ |
13 | 13 | class HtmlTableContent extends HtmlSemCollection { |
14 | - protected $_tdTagNames=[ "thead" => "th","tbody" => "td","tfoot" => "th" ]; |
|
14 | + protected $_tdTagNames=["thead" => "th", "tbody" => "td", "tfoot" => "th"]; |
|
15 | 15 | protected $_merged=false; |
16 | 16 | |
17 | 17 | /** |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | */ |
36 | 36 | public function setRowCount($rowCount, $colCount) { |
37 | 37 | $count=$this->count(); |
38 | - for($i=$count; $i < $rowCount; $i++) { |
|
38 | + for ($i=$count; $i<$rowCount; $i++) { |
|
39 | 39 | $this->addItem($colCount); |
40 | 40 | } |
41 | 41 | return $this; |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | $tr=new HtmlTR("", $value); |
58 | 58 | $tr->setContainer($this, $count); |
59 | 59 | $tr->setTdTagName($this->_tdTagNames[$this->tagName]); |
60 | - if (isset($value) === true) { |
|
60 | + if (isset($value)===true) { |
|
61 | 61 | $tr->setColCount($value); |
62 | 62 | } |
63 | 63 | return $tr; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | */ |
116 | 116 | public function setCellValue($row, $col, $value="") { |
117 | 117 | $cell=$this->getCell($row, $col); |
118 | - if (isset($cell) === true) { |
|
118 | + if (isset($cell)===true) { |
|
119 | 119 | $cell->setValue($value); |
120 | 120 | } |
121 | 121 | return $this; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | * @param mixed $values |
127 | 127 | */ |
128 | 128 | public function setValues($values=array()) { |
129 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->setValues($_values);}); |
|
129 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->setValues($_values); }); |
|
130 | 130 | } |
131 | 131 | |
132 | 132 | /** |
@@ -134,7 +134,7 @@ discard block |
||
134 | 134 | * @param mixed $values |
135 | 135 | */ |
136 | 136 | public function addValues($values=array()) { |
137 | - return $this->_addOrSetValues($values, function(HtmlTR $row,$_values){$row->addValues($_values);}); |
|
137 | + return $this->_addOrSetValues($values, function(HtmlTR $row, $_values) {$row->addValues($_values); }); |
|
138 | 138 | } |
139 | 139 | |
140 | 140 | /** |
@@ -142,21 +142,21 @@ discard block |
||
142 | 142 | * @param mixed $values |
143 | 143 | * @param callable $callback |
144 | 144 | */ |
145 | - protected function _addOrSetValues($values,$callback) { |
|
145 | + protected function _addOrSetValues($values, $callback) { |
|
146 | 146 | $count=$this->count(); |
147 | 147 | $isArray=true; |
148 | 148 | if (!\is_array($values)) { |
149 | 149 | $values=\array_fill(0, $count, $values); |
150 | 150 | $isArray=false; |
151 | 151 | } |
152 | - if (JArray::dimension($values) == 1 && $isArray) |
|
153 | - $values=[ $values ]; |
|
152 | + if (JArray::dimension($values)==1 && $isArray) |
|
153 | + $values=[$values]; |
|
154 | 154 | |
155 | 155 | $count=\min(\sizeof($values), $count); |
156 | 156 | |
157 | - for($i=0; $i < $count; $i++) { |
|
157 | + for ($i=0; $i<$count; $i++) { |
|
158 | 158 | $row=$this->content[$i]; |
159 | - $callback($row,$values[$i]); |
|
159 | + $callback($row, $values[$i]); |
|
160 | 160 | } |
161 | 161 | return $this; |
162 | 162 | } |
@@ -167,7 +167,7 @@ discard block |
||
167 | 167 | $values=\array_fill(0, $count, $values); |
168 | 168 | } |
169 | 169 | $count=\min(\sizeof($values), $count); |
170 | - for($i=0; $i < $count; $i++) { |
|
170 | + for ($i=0; $i<$count; $i++) { |
|
171 | 171 | $this->getCell($i, $colIndex)->setValue($values[$i]); |
172 | 172 | } |
173 | 173 | return $this; |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | |
176 | 176 | public function addColVariations($colIndex, $variations=array()) { |
177 | 177 | $count=$this->count(); |
178 | - for($i=0; $i < $count; $i++) { |
|
178 | + for ($i=0; $i<$count; $i++) { |
|
179 | 179 | $this->getCell($i, $colIndex)->addVariations($variations); |
180 | 180 | } |
181 | 181 | return $this; |
@@ -192,9 +192,9 @@ discard block |
||
192 | 192 | |
193 | 193 | private function colAlign($colIndex, $function) { |
194 | 194 | $count=$this->count(); |
195 | - for($i=0; $i < $count; $i++) { |
|
195 | + for ($i=0; $i<$count; $i++) { |
|
196 | 196 | $index=$this->content[$i]->getColPosition($colIndex); |
197 | - if ($index !== NULL) |
|
197 | + if ($index!==NULL) |
|
198 | 198 | $this->getCell($i, $index)->$function(); |
199 | 199 | } |
200 | 200 | return $this; |
@@ -226,7 +226,7 @@ discard block |
||
226 | 226 | */ |
227 | 227 | public function getColCount() { |
228 | 228 | $result=0; |
229 | - if ($this->count() > 0) |
|
229 | + if ($this->count()>0) |
|
230 | 230 | $result=$this->getItem(0)->count(); |
231 | 231 | return $result; |
232 | 232 | } |
@@ -240,7 +240,7 @@ discard block |
||
240 | 240 | public function delete($rowIndex, $colIndex=NULL) { |
241 | 241 | if (isset($colIndex)) { |
242 | 242 | $row=$this->getItem($rowIndex); |
243 | - if (isset($row) === true) { |
|
243 | + if (isset($row)===true) { |
|
244 | 244 | $row->delete($colIndex); |
245 | 245 | } |
246 | 246 | } else { |
@@ -249,9 +249,9 @@ discard block |
||
249 | 249 | return $this; |
250 | 250 | } |
251 | 251 | |
252 | - public function toDelete($rowIndex, $colIndex){ |
|
252 | + public function toDelete($rowIndex, $colIndex) { |
|
253 | 253 | $row=$this->getItem($rowIndex); |
254 | - if (isset($row) === true) |
|
254 | + if (isset($row)===true) |
|
255 | 255 | $row->toDelete($colIndex); |
256 | 256 | return $this; |
257 | 257 | } |
@@ -280,17 +280,17 @@ discard block |
||
280 | 280 | */ |
281 | 281 | public function conditionalCellFormat($callback, $format) { |
282 | 282 | $rows=$this->content; |
283 | - foreach ( $rows as $row ) { |
|
283 | + foreach ($rows as $row) { |
|
284 | 284 | $row->conditionalCellFormat($callback, $format); |
285 | 285 | } |
286 | 286 | return $this; |
287 | 287 | } |
288 | 288 | |
289 | - public function conditionalColFormat($colIndex,$callback,$format){ |
|
289 | + public function conditionalColFormat($colIndex, $callback, $format) { |
|
290 | 290 | $rows=$this->content; |
291 | - foreach ( $rows as $row ) { |
|
291 | + foreach ($rows as $row) { |
|
292 | 292 | $cell=$row->getItem($colIndex); |
293 | - $cell->conditionnalCellFormat($callback,$format); |
|
293 | + $cell->conditionnalCellFormat($callback, $format); |
|
294 | 294 | } |
295 | 295 | return $this; |
296 | 296 | } |
@@ -302,17 +302,17 @@ discard block |
||
302 | 302 | */ |
303 | 303 | public function conditionalRowFormat($callback, $format) { |
304 | 304 | $rows=$this->content; |
305 | - foreach ( $rows as $row ) { |
|
305 | + foreach ($rows as $row) { |
|
306 | 306 | $row->conditionalRowFormat($callback, $format); |
307 | 307 | } |
308 | 308 | return $this; |
309 | 309 | } |
310 | 310 | |
311 | - public function hideColumn($colIndex){ |
|
311 | + public function hideColumn($colIndex) { |
|
312 | 312 | $rows=$this->content; |
313 | - foreach ( $rows as $row ) { |
|
313 | + foreach ($rows as $row) { |
|
314 | 314 | $cell=$row->getItem($colIndex); |
315 | - $cell->addToProperty("style","display:none;"); |
|
315 | + $cell->addToProperty("style", "display:none;"); |
|
316 | 316 | } |
317 | 317 | return $this; |
318 | 318 | } |
@@ -323,7 +323,7 @@ discard block |
||
323 | 323 | */ |
324 | 324 | public function applyCells($callback) { |
325 | 325 | $rows=$this->content; |
326 | - foreach ( $rows as $row ) { |
|
326 | + foreach ($rows as $row) { |
|
327 | 327 | $row->applyCells($callback); |
328 | 328 | } |
329 | 329 | return $this; |
@@ -335,25 +335,25 @@ discard block |
||
335 | 335 | */ |
336 | 336 | public function applyRows($callback) { |
337 | 337 | $rows=$this->content; |
338 | - foreach ( $rows as $row ) { |
|
338 | + foreach ($rows as $row) { |
|
339 | 339 | $row->apply($callback); |
340 | 340 | } |
341 | 341 | return $this; |
342 | 342 | } |
343 | 343 | |
344 | - public function mergeIdentiqualValues($colIndex,$function="strip_tags"){ |
|
344 | + public function mergeIdentiqualValues($colIndex, $function="strip_tags") { |
|
345 | 345 | $rows=$this->content; |
346 | 346 | $identiqual=null; |
347 | 347 | $counter=0; |
348 | 348 | $cellToMerge=null; |
349 | 349 | $functionExists=\function_exists($function); |
350 | - foreach ( $rows as $row ) { |
|
350 | + foreach ($rows as $row) { |
|
351 | 351 | $cell=$row->getItem($colIndex); |
352 | 352 | $value=$cell->getContent(); |
353 | - if($functionExists) |
|
354 | - $value=\call_user_func($function,$value); |
|
355 | - if($value!==$identiqual){ |
|
356 | - if($counter>0 && isset($cellToMerge)){ |
|
353 | + if ($functionExists) |
|
354 | + $value=\call_user_func($function, $value); |
|
355 | + if ($value!==$identiqual) { |
|
356 | + if ($counter>0 && isset($cellToMerge)) { |
|
357 | 357 | $cellToMerge->setRowspan($counter); |
358 | 358 | } |
359 | 359 | $counter=0; |
@@ -362,17 +362,17 @@ discard block |
||
362 | 362 | } |
363 | 363 | $counter++; |
364 | 364 | } |
365 | - if($counter>0 && isset($cellToMerge)){ |
|
365 | + if ($counter>0 && isset($cellToMerge)) { |
|
366 | 366 | $cellToMerge->setRowspan($counter); |
367 | 367 | } |
368 | 368 | return $this; |
369 | 369 | } |
370 | 370 | |
371 | - public function _isMerged(){ |
|
371 | + public function _isMerged() { |
|
372 | 372 | return $this->_merged; |
373 | 373 | } |
374 | 374 | |
375 | - public function _setMerged($value){ |
|
375 | + public function _setMerged($value) { |
|
376 | 376 | $this->_merged=$value; |
377 | 377 | return $this; |
378 | 378 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | use Ajax\semantic\html\modules\HtmlModal; |
21 | 21 | |
22 | 22 | abstract class Widget extends HtmlDoubleElement { |
23 | - use FieldAsTrait,FormTrait; |
|
23 | + use FieldAsTrait, FormTrait; |
|
24 | 24 | |
25 | 25 | /** |
26 | 26 | * @var string classname |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | protected $_generated; |
54 | 54 | |
55 | 55 | |
56 | - public function __construct($identifier,$model,$modelInstance=NULL) { |
|
56 | + public function __construct($identifier, $model, $modelInstance=NULL) { |
|
57 | 57 | parent::__construct($identifier); |
58 | 58 | $this->_template="%wrapContentBefore%%content%%wrapContentAfter%"; |
59 | 59 | $this->setModel($model); |
60 | - if(isset($modelInstance)){ |
|
60 | + if (isset($modelInstance)) { |
|
61 | 61 | $this->show($modelInstance); |
62 | 62 | } |
63 | 63 | $this->_generated=false; |
64 | 64 | } |
65 | 65 | |
66 | - protected function _init($instanceViewer,$contentKey,$content,$edition){ |
|
66 | + protected function _init($instanceViewer, $contentKey, $content, $edition) { |
|
67 | 67 | $this->_instanceViewer=$instanceViewer; |
68 | 68 | $this->content=[$contentKey=>$content]; |
69 | 69 | $this->_self=$content; |
@@ -75,31 +75,31 @@ discard block |
||
75 | 75 | * @param int|string $fieldName |
76 | 76 | * @return int|string |
77 | 77 | */ |
78 | - protected function _getIndex($fieldName){ |
|
78 | + protected function _getIndex($fieldName) { |
|
79 | 79 | $index=$fieldName; |
80 | - if(\is_string($fieldName)){ |
|
80 | + if (\is_string($fieldName)) { |
|
81 | 81 | $fields=$this->_instanceViewer->getVisibleProperties(); |
82 | 82 | $index=\array_search($fieldName, $fields); |
83 | 83 | } |
84 | 84 | return $index; |
85 | 85 | } |
86 | 86 | |
87 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
87 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
88 | 88 | return $this->identifier."-{$prefix}-".$this->_instanceViewer->getIdentifier(); |
89 | 89 | } |
90 | 90 | |
91 | - protected function _getFieldName($index){ |
|
91 | + protected function _getFieldName($index) { |
|
92 | 92 | return $this->_instanceViewer->getFieldName($index); |
93 | 93 | } |
94 | 94 | |
95 | - protected function _getFieldCaption($index){ |
|
95 | + protected function _getFieldCaption($index) { |
|
96 | 96 | return $this->_instanceViewer->getCaption($index); |
97 | 97 | } |
98 | 98 | |
99 | - abstract protected function _setToolbarPosition($table,$captions=NULL); |
|
99 | + abstract protected function _setToolbarPosition($table, $captions=NULL); |
|
100 | 100 | |
101 | - public function show($modelInstance){ |
|
102 | - if(\is_array($modelInstance)){ |
|
101 | + public function show($modelInstance) { |
|
102 | + if (\is_array($modelInstance)) { |
|
103 | 103 | $modelInstance=\json_decode(\json_encode($modelInstance), FALSE); |
104 | 104 | } |
105 | 105 | $this->_modelInstance=$modelInstance; |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | |
126 | 126 | abstract public function getHtmlComponent(); |
127 | 127 | |
128 | - public function setAttached($value=true){ |
|
128 | + public function setAttached($value=true) { |
|
129 | 129 | return $this->getHtmlComponent()->setAttached($value); |
130 | 130 | } |
131 | 131 | |
@@ -136,59 +136,59 @@ discard block |
||
136 | 136 | * @param callable $callback function called after the field compilation |
137 | 137 | * @return Widget |
138 | 138 | */ |
139 | - public function afterCompile($index,$callback){ |
|
139 | + public function afterCompile($index, $callback) { |
|
140 | 140 | $index=$this->_getIndex($index); |
141 | 141 | $this->_instanceViewer->afterCompile($index, $callback); |
142 | 142 | return $this; |
143 | 143 | } |
144 | 144 | |
145 | - public function setColor($color){ |
|
145 | + public function setColor($color) { |
|
146 | 146 | return $this->getHtmlComponent()->setColor($color); |
147 | 147 | } |
148 | 148 | |
149 | 149 | |
150 | - public function setCaptions($captions){ |
|
150 | + public function setCaptions($captions) { |
|
151 | 151 | $this->_instanceViewer->setCaptions($captions); |
152 | 152 | return $this; |
153 | 153 | } |
154 | 154 | |
155 | - public function setCaption($index,$caption){ |
|
155 | + public function setCaption($index, $caption) { |
|
156 | 156 | $this->_instanceViewer->setCaption($this->_getIndex($index), $caption); |
157 | 157 | return $this; |
158 | 158 | } |
159 | 159 | |
160 | - public function setFields($fields){ |
|
160 | + public function setFields($fields) { |
|
161 | 161 | $this->_instanceViewer->setVisibleProperties($fields); |
162 | 162 | return $this; |
163 | 163 | } |
164 | 164 | |
165 | - public function addField($field){ |
|
165 | + public function addField($field) { |
|
166 | 166 | $this->_instanceViewer->addField($field); |
167 | 167 | return $this; |
168 | 168 | } |
169 | 169 | |
170 | - public function addFields($fields){ |
|
170 | + public function addFields($fields) { |
|
171 | 171 | $this->_instanceViewer->addFields($fields); |
172 | 172 | return $this; |
173 | 173 | } |
174 | 174 | |
175 | - public function addMessage($attributes=NULL,$fieldName="message"){ |
|
175 | + public function addMessage($attributes=NULL, $fieldName="message") { |
|
176 | 176 | $this->_instanceViewer->addField($fieldName); |
177 | 177 | $count=$this->_instanceViewer->visiblePropertiesCount(); |
178 | - return $this->fieldAsMessage($count-1,$attributes); |
|
178 | + return $this->fieldAsMessage($count-1, $attributes); |
|
179 | 179 | } |
180 | 180 | |
181 | - public function addErrorMessage(){ |
|
182 | - return $this->addMessage(["error"=>true],"message"); |
|
181 | + public function addErrorMessage() { |
|
182 | + return $this->addMessage(["error"=>true], "message"); |
|
183 | 183 | } |
184 | 184 | |
185 | - public function insertField($index,$field){ |
|
185 | + public function insertField($index, $field) { |
|
186 | 186 | $index=$this->_getIndex($index); |
187 | 187 | $this->_instanceViewer->insertField($index, $field); |
188 | 188 | return $this; |
189 | 189 | } |
190 | 190 | |
191 | - public function insertInField($index,$field){ |
|
191 | + public function insertInField($index, $field) { |
|
192 | 192 | $index=$this->_getIndex($index); |
193 | 193 | $this->_instanceViewer->insertInField($index, $field); |
194 | 194 | return $this; |
@@ -200,13 +200,13 @@ discard block |
||
200 | 200 | * @param callable $callback function parameters are : $value : the field value, $instance : the active instance of model, $fieldIndex : the field index, $rowIndex : the row index |
201 | 201 | * @return Widget |
202 | 202 | */ |
203 | - public function setValueFunction($index,$callback){ |
|
203 | + public function setValueFunction($index, $callback) { |
|
204 | 204 | $index=$this->_getIndex($index); |
205 | 205 | $this->_instanceViewer->setValueFunction($index, $callback); |
206 | 206 | return $this; |
207 | 207 | } |
208 | 208 | |
209 | - public function setIdentifierFunction($callback){ |
|
209 | + public function setIdentifierFunction($callback) { |
|
210 | 210 | $this->_instanceViewer->setIdentifierFunction($callback); |
211 | 211 | return $this; |
212 | 212 | } |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | /** |
215 | 215 | * @return \Ajax\semantic\html\collections\menus\HtmlMenu |
216 | 216 | */ |
217 | - public function getToolbar(){ |
|
218 | - if(isset($this->_toolbar)===false){ |
|
217 | + public function getToolbar() { |
|
218 | + if (isset($this->_toolbar)===false) { |
|
219 | 219 | $this->_toolbar=new HtmlMenu("toolbar-".$this->identifier); |
220 | 220 | } |
221 | 221 | return $this->_toolbar; |
@@ -227,15 +227,15 @@ discard block |
||
227 | 227 | * @param callable $callback function to call on $element |
228 | 228 | * @return \Ajax\common\html\HtmlDoubleElement |
229 | 229 | */ |
230 | - public function addInToolbar($element,$callback=NULL){ |
|
230 | + public function addInToolbar($element, $callback=NULL) { |
|
231 | 231 | $tb=$this->getToolbar(); |
232 | - if($element instanceof BaseWidget){ |
|
233 | - if($element->getIdentifier()===""){ |
|
232 | + if ($element instanceof BaseWidget) { |
|
233 | + if ($element->getIdentifier()==="") { |
|
234 | 234 | $element->setIdentifier("tb-item-".$this->identifier."-".$tb->count()); |
235 | 235 | } |
236 | 236 | } |
237 | - if(isset($callback)){ |
|
238 | - if(\is_callable($callback)){ |
|
237 | + if (isset($callback)) { |
|
238 | + if (\is_callable($callback)) { |
|
239 | 239 | $callback($element); |
240 | 240 | } |
241 | 241 | } |
@@ -248,9 +248,9 @@ discard block |
||
248 | 248 | * @param callable $callback function($element) |
249 | 249 | * @return \Ajax\common\html\HtmlDoubleElement |
250 | 250 | */ |
251 | - public function addItemInToolbar($caption,$icon=NULL,$callback=NULL){ |
|
252 | - $result=$this->addInToolbar($caption,$callback); |
|
253 | - if(isset($icon)) |
|
251 | + public function addItemInToolbar($caption, $icon=NULL, $callback=NULL) { |
|
252 | + $result=$this->addInToolbar($caption, $callback); |
|
253 | + if (isset($icon)) |
|
254 | 254 | $result->addIcon($icon); |
255 | 255 | return $result; |
256 | 256 | } |
@@ -260,14 +260,14 @@ discard block |
||
260 | 260 | * @param callable $callback function($element) |
261 | 261 | * @return \Ajax\common\Widget |
262 | 262 | */ |
263 | - public function addItemsInToolbar(array $items,$callback=NULL){ |
|
264 | - if(JArray::isAssociative($items)){ |
|
265 | - foreach ($items as $icon=>$item){ |
|
266 | - $this->addItemInToolbar($item,$icon,$callback); |
|
263 | + public function addItemsInToolbar(array $items, $callback=NULL) { |
|
264 | + if (JArray::isAssociative($items)) { |
|
265 | + foreach ($items as $icon=>$item) { |
|
266 | + $this->addItemInToolbar($item, $icon, $callback); |
|
267 | 267 | } |
268 | - }else{ |
|
269 | - foreach ($items as $item){ |
|
270 | - $this->addItemInToolbar($item,null,$callback); |
|
268 | + } else { |
|
269 | + foreach ($items as $item) { |
|
270 | + $this->addItemInToolbar($item, null, $callback); |
|
271 | 271 | } |
272 | 272 | } |
273 | 273 | return $this; |
@@ -279,12 +279,12 @@ discard block |
||
279 | 279 | * @param callable $callback function($element) |
280 | 280 | * @return \Ajax\common\html\HtmlDoubleElement |
281 | 281 | */ |
282 | - public function addDropdownInToolbar($value,$items,$callback=NULL){ |
|
282 | + public function addDropdownInToolbar($value, $items, $callback=NULL) { |
|
283 | 283 | $dd=$value; |
284 | 284 | if (\is_string($value)) { |
285 | - $dd=new HtmlDropdown("dropdown-". $this->identifier."-".$value, $value, $items); |
|
285 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$value, $value, $items); |
|
286 | 286 | } |
287 | - return $this->addInToolbar($dd,$callback); |
|
287 | + return $this->addInToolbar($dd, $callback); |
|
288 | 288 | } |
289 | 289 | |
290 | 290 | /** |
@@ -293,9 +293,9 @@ discard block |
||
293 | 293 | * @param callable $callback function($element) |
294 | 294 | * @return \Ajax\common\html\HtmlDoubleElement |
295 | 295 | */ |
296 | - public function addButtonInToolbar($caption,$cssStyle=null,$callback=NULL){ |
|
297 | - $bt=new HtmlButton("bt-".$caption,$caption,$cssStyle); |
|
298 | - return $this->addInToolbar($bt,$callback); |
|
296 | + public function addButtonInToolbar($caption, $cssStyle=null, $callback=NULL) { |
|
297 | + $bt=new HtmlButton("bt-".$caption, $caption, $cssStyle); |
|
298 | + return $this->addInToolbar($bt, $callback); |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | /** |
@@ -304,9 +304,9 @@ discard block |
||
304 | 304 | * @param callable $callback function($element) |
305 | 305 | * @return \Ajax\common\html\HtmlDoubleElement |
306 | 306 | */ |
307 | - public function addButtonsInToolbar(array $captions,$asIcon=false,$callback=NULL){ |
|
308 | - $bts=new HtmlButtonGroups("",$captions,$asIcon); |
|
309 | - return $this->addInToolbar($bts,$callback); |
|
307 | + public function addButtonsInToolbar(array $captions, $asIcon=false, $callback=NULL) { |
|
308 | + $bts=new HtmlButtonGroups("", $captions, $asIcon); |
|
309 | + return $this->addInToolbar($bts, $callback); |
|
310 | 310 | } |
311 | 311 | |
312 | 312 | /** |
@@ -316,15 +316,15 @@ discard block |
||
316 | 316 | * @param boolean $labeled |
317 | 317 | * @return \Ajax\common\html\HtmlDoubleElement |
318 | 318 | */ |
319 | - public function addLabelledIconButtonInToolbar($caption,$icon,$before=true,$labeled=false){ |
|
320 | - $bt=new HtmlButton("",$caption); |
|
321 | - $bt->addIcon($icon,$before,$labeled); |
|
319 | + public function addLabelledIconButtonInToolbar($caption, $icon, $before=true, $labeled=false) { |
|
320 | + $bt=new HtmlButton("", $caption); |
|
321 | + $bt->addIcon($icon, $before, $labeled); |
|
322 | 322 | return $this->addInToolbar($bt); |
323 | 323 | } |
324 | 324 | |
325 | - public function addSubmitInToolbar($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
326 | - $button=new HtmlButton($identifier,$value,$cssStyle); |
|
327 | - $this->_buttonAsSubmit($button,"click",$url,$responseElement,$parameters); |
|
325 | + public function addSubmitInToolbar($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
326 | + $button=new HtmlButton($identifier, $value, $cssStyle); |
|
327 | + $this->_buttonAsSubmit($button, "click", $url, $responseElement, $parameters); |
|
328 | 328 | return $this->addInToolbar($button); |
329 | 329 | } |
330 | 330 | |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | * @param callable $defaultValueFunction function parameters are : $name : the field name, $value : the field value ,$index : the field index, $instance : the active instance of model |
355 | 355 | * @return \Ajax\common\Widget |
356 | 356 | */ |
357 | - public function setDefaultValueFunction($defaultValueFunction){ |
|
357 | + public function setDefaultValueFunction($defaultValueFunction) { |
|
358 | 358 | $this->_instanceViewer->setDefaultValueFunction($defaultValueFunction); |
359 | 359 | return $this; |
360 | 360 | } |
@@ -363,7 +363,7 @@ discard block |
||
363 | 363 | * @param string|boolean $disable |
364 | 364 | * @return string |
365 | 365 | */ |
366 | - public function jsDisabled($disable=true){ |
|
366 | + public function jsDisabled($disable=true) { |
|
367 | 367 | return "$('#".$this->identifier." .ui.input,#".$this->identifier." .ui.dropdown,#".$this->identifier." .ui.checkbox').toggleClass('disabled',".$disable.");"; |
368 | 368 | } |
369 | 369 | |
@@ -372,12 +372,12 @@ discard block |
||
372 | 372 | * @param callable $callback function($element) |
373 | 373 | * @return \Ajax\common\html\HtmlDoubleElement |
374 | 374 | */ |
375 | - public function addEditButtonInToolbar($caption,$callback=NULL){ |
|
376 | - $bt=new HtmlButton($this->identifier."-editBtn",$caption); |
|
375 | + public function addEditButtonInToolbar($caption, $callback=NULL) { |
|
376 | + $bt=new HtmlButton($this->identifier."-editBtn", $caption); |
|
377 | 377 | $bt->setToggle(); |
378 | 378 | $bt->setActive($this->_edition); |
379 | 379 | $bt->onClick($this->jsDisabled(Javascript::prep_value("!$(event.target).hasClass('active')"))); |
380 | - return $this->addInToolbar($bt,$callback); |
|
380 | + return $this->addInToolbar($bt, $callback); |
|
381 | 381 | } |
382 | 382 | |
383 | 383 | public function setToolbar(HtmlMenu $_toolbar) { |
@@ -391,35 +391,35 @@ discard block |
||
391 | 391 | } |
392 | 392 | |
393 | 393 | public function getForm() { |
394 | - if(!isset($this->_form)){ |
|
394 | + if (!isset($this->_form)) { |
|
395 | 395 | $this->_form=new HtmlForm("frm-".$this->identifier); |
396 | 396 | $this->setEdition(true); |
397 | 397 | } |
398 | 398 | return $this->_form; |
399 | 399 | } |
400 | 400 | |
401 | - public function run(JsUtils $js){ |
|
401 | + public function run(JsUtils $js) { |
|
402 | 402 | $result=parent::run($js); |
403 | - if(isset($this->_form)){ |
|
403 | + if (isset($this->_form)) { |
|
404 | 404 | $result=$this->runForm($js); |
405 | 405 | } |
406 | 406 | return $result; |
407 | 407 | } |
408 | 408 | |
409 | - protected function runForm(JsUtils $js){ |
|
409 | + protected function runForm(JsUtils $js) { |
|
410 | 410 | $fields=$this->getContentInstances(HtmlFormField::class); |
411 | - foreach ($fields as $field){ |
|
411 | + foreach ($fields as $field) { |
|
412 | 412 | $this->_form->addField($field); |
413 | 413 | } |
414 | 414 | return $this->_form->run($js); |
415 | 415 | } |
416 | 416 | |
417 | - protected function _compileForm(){ |
|
418 | - if(isset($this->_form)){ |
|
417 | + protected function _compileForm() { |
|
418 | + if (isset($this->_form)) { |
|
419 | 419 | $noValidate=""; |
420 | - if(\sizeof($this->_form->getValidationParams())>0) |
|
420 | + if (\sizeof($this->_form->getValidationParams())>0) |
|
421 | 421 | $noValidate="novalidate"; |
422 | - $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">","</form>"); |
|
422 | + $this->wrapContent("<form class='ui form' id='frm-".$this->identifier."' name='frm-".$this->identifier."' ".$noValidate.">", "</form>"); |
|
423 | 423 | } |
424 | 424 | } |
425 | 425 | |
@@ -428,32 +428,32 @@ discard block |
||
428 | 428 | return $this; |
429 | 429 | } |
430 | 430 | |
431 | - public function moveFieldTo($from,$to){ |
|
431 | + public function moveFieldTo($from, $to) { |
|
432 | 432 | return $this->_instanceViewer->moveFieldTo($from, $to); |
433 | 433 | } |
434 | 434 | |
435 | - public function swapFields($index1,$index2){ |
|
435 | + public function swapFields($index1, $index2) { |
|
436 | 436 | $index1=$this->_getIndex($index1); |
437 | 437 | $index2=$this->_getIndex($index2); |
438 | 438 | return $this->_instanceViewer->swapFields($index1, $index2); |
439 | 439 | } |
440 | 440 | |
441 | - public function removeField($index){ |
|
441 | + public function removeField($index) { |
|
442 | 442 | $index=$this->_getIndex($index); |
443 | 443 | $this->_instanceViewer->removeField($index); |
444 | 444 | return $this; |
445 | 445 | } |
446 | 446 | |
447 | - public function asModal($header=null){ |
|
448 | - $modal=new HtmlModal("modal-".$this->identifier,$header); |
|
447 | + public function asModal($header=null) { |
|
448 | + $modal=new HtmlModal("modal-".$this->identifier, $header); |
|
449 | 449 | $modal->setContent($this); |
450 | - if(isset($this->_form)){ |
|
450 | + if (isset($this->_form)) { |
|
451 | 451 | $this->_form->onSuccess($modal->jsHide()); |
452 | 452 | } |
453 | 453 | return $modal; |
454 | 454 | } |
455 | 455 | |
456 | 456 | public function addToProperty($name, $value, $separator=" ") { |
457 | - return $this->getHtmlComponent()->addToProperty($name,$value,$separator); |
|
457 | + return $this->getHtmlComponent()->addToProperty($name, $value, $separator); |
|
458 | 458 | } |
459 | 459 | } |
@@ -40,12 +40,12 @@ discard block |
||
40 | 40 | * @return \Ajax\semantic\html\collections\HtmlMenu |
41 | 41 | */ |
42 | 42 | public function setType($type="") { |
43 | - return $this->addToPropertyCtrl("class", $type, array ("","item","text" )); |
|
43 | + return $this->addToPropertyCtrl("class", $type, array("", "item", "text")); |
|
44 | 44 | } |
45 | 45 | |
46 | 46 | public function setActiveItem($index) { |
47 | 47 | $item=$this->getItem($index); |
48 | - if ($item !== null) { |
|
48 | + if ($item!==null) { |
|
49 | 49 | $item->addToProperty("class", "active"); |
50 | 50 | } |
51 | 51 | return $this; |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | |
54 | 54 | private function getItemToInsert($item) { |
55 | 55 | if ($item instanceof HtmlInput || $item instanceof HtmlImg || $item instanceof HtmlIcon || $item instanceof HtmlButtonGroups || $item instanceof HtmlButton || $item instanceof HtmlLabel) { |
56 | - $itemO=new HtmlMenuItem("item-" . $this->identifier . "-" . \sizeof($this->content) , $item); |
|
56 | + $itemO=new HtmlMenuItem("item-".$this->identifier."-".\sizeof($this->content), $item); |
|
57 | 57 | $item=$itemO; |
58 | 58 | } |
59 | 59 | return $item; |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | |
62 | 62 | private function afterInsert($item) { |
63 | 63 | if (!$item instanceof HtmlMenu && $item->propertyContains("class", "header")===false) |
64 | - $item->addToPropertyCtrl("class", "item", array ("item" )); |
|
64 | + $item->addToPropertyCtrl("class", "item", array("item")); |
|
65 | 65 | else { |
66 | 66 | $this->setSecondary(); |
67 | 67 | } |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | public function addItem($item) { |
78 | 78 | $number=$item; |
79 | 79 | $item=parent::addItem($this->getItemToInsert($item)); |
80 | - if(\is_int($number)) |
|
80 | + if (\is_int($number)) |
|
81 | 81 | $item->setProperty("data-page", $number); |
82 | 82 | return $this->afterInsert($item); |
83 | 83 | } |
@@ -95,15 +95,15 @@ discard block |
||
95 | 95 | |
96 | 96 | public function generateMenuAsItem($menu, $header=null) { |
97 | 97 | $count=$this->count(); |
98 | - $item=new HtmlSemDoubleElement("item-" . $this->identifier . "-" . $count, "div"); |
|
98 | + $item=new HtmlSemDoubleElement("item-".$this->identifier."-".$count, "div"); |
|
99 | 99 | if (isset($header)) { |
100 | - $headerItem=new HtmlSemDoubleElement("item-header-" . $this->identifier . "-" . $count, "div", "header"); |
|
100 | + $headerItem=new HtmlSemDoubleElement("item-header-".$this->identifier."-".$count, "div", "header"); |
|
101 | 101 | $headerItem->setContent($header); |
102 | 102 | $item->addContent($headerItem); |
103 | 103 | $this->_itemHeader=$headerItem; |
104 | 104 | } |
105 | - if(\is_array($menu)){ |
|
106 | - $menu=new HtmlMenu("menu-" . $this->identifier . "-" . $count,$menu); |
|
105 | + if (\is_array($menu)) { |
|
106 | + $menu=new HtmlMenu("menu-".$this->identifier."-".$count, $menu); |
|
107 | 107 | } |
108 | 108 | $menu->setClass("menu"); |
109 | 109 | $item->addContent($menu); |
@@ -118,7 +118,7 @@ discard block |
||
118 | 118 | $value=new HtmlSemDoubleElement($identifier, "a", "browse item", $value); |
119 | 119 | $value->addContent(new HtmlIcon("", "dropdown")); |
120 | 120 | $value=$this->addItem($value); |
121 | - $popup=new HtmlPopup($value, "popup-" . $this->identifier . "-" . $this->count(), $content); |
|
121 | + $popup=new HtmlPopup($value, "popup-".$this->identifier."-".$this->count(), $content); |
|
122 | 122 | $popup->setFlowing()->setPosition("bottom left")->setOn("click"); |
123 | 123 | $this->wrap("", $popup); |
124 | 124 | return $popup; |
@@ -127,7 +127,7 @@ discard block |
||
127 | 127 | public function addDropdownAsItem($value, $items=NULL) { |
128 | 128 | $dd=$value; |
129 | 129 | if (\is_string($value)) { |
130 | - $dd=new HtmlDropdown("dropdown-" . $this->identifier . "-" . $this->count(), $value, $items); |
|
130 | + $dd=new HtmlDropdown("dropdown-".$this->identifier."-".$this->count(), $value, $items); |
|
131 | 131 | } |
132 | 132 | $this->addItem($dd); |
133 | 133 | return $dd; |
@@ -140,14 +140,14 @@ discard block |
||
140 | 140 | * @see \Ajax\common\html\html5\HtmlCollection::createItem() |
141 | 141 | */ |
142 | 142 | protected function createItem($value) { |
143 | - $itemO=new HtmlMenuItem($this->identifier."-item-" . \sizeof($this->content),""); |
|
143 | + $itemO=new HtmlMenuItem($this->identifier."-item-".\sizeof($this->content), ""); |
|
144 | 144 | $itemO->setTagName("a"); |
145 | 145 | $itemO->setContent($value); |
146 | 146 | return $itemO; |
147 | 147 | } |
148 | 148 | |
149 | 149 | public function setSecondary($value=true) { |
150 | - if($value) |
|
150 | + if ($value) |
|
151 | 151 | $this->addToProperty("class", "secondary"); |
152 | 152 | else |
153 | 153 | $this->removePropertyValue("class", "secondary"); |
@@ -155,28 +155,28 @@ discard block |
||
155 | 155 | } |
156 | 156 | |
157 | 157 | public function setVertical() { |
158 | - return $this->addToPropertyCtrl("class", "vertical", array ("vertical" )); |
|
158 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | public function setPosition($value="right") { |
162 | - return $this->addToPropertyCtrl("class", $value, array ("right","left" )); |
|
162 | + return $this->addToPropertyCtrl("class", $value, array("right", "left")); |
|
163 | 163 | } |
164 | 164 | |
165 | 165 | public function setPointing($value=Direction::NONE) { |
166 | - return $this->addToPropertyCtrl("class", $value . " pointing", Direction::getConstantValues("pointing")); |
|
166 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
167 | 167 | } |
168 | 168 | |
169 | 169 | public function asTab($vertical=false) { |
170 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
170 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
171 | 171 | $item->setTagName("a"); |
172 | 172 | }); |
173 | - if ($vertical === true) |
|
173 | + if ($vertical===true) |
|
174 | 174 | $this->setVertical(); |
175 | 175 | return $this->addToProperty("class", "tabular"); |
176 | 176 | } |
177 | 177 | |
178 | 178 | public function asPagination() { |
179 | - $this->apply(function (HtmlDoubleElement &$item) { |
|
179 | + $this->apply(function(HtmlDoubleElement &$item) { |
|
180 | 180 | $item->setTagName("a"); |
181 | 181 | }); |
182 | 182 | return $this->addToProperty("class", "pagination"); |
@@ -213,10 +213,10 @@ discard block |
||
213 | 213 | */ |
214 | 214 | public function setWidth($width) { |
215 | 215 | if (\is_int($width)) { |
216 | - $width=Wide::getConstants()["W" . $width]; |
|
216 | + $width=Wide::getConstants()["W".$width]; |
|
217 | 217 | } |
218 | 218 | $this->addToPropertyCtrl("class", $width, Wide::getConstants()); |
219 | - return $this->addToPropertyCtrl("class", "item", array ("item" )); |
|
219 | + return $this->addToPropertyCtrl("class", "item", array("item")); |
|
220 | 220 | } |
221 | 221 | |
222 | 222 | public function addImage($identifier, $src="", $alt="") { |
@@ -231,14 +231,14 @@ discard block |
||
231 | 231 | return $this->_itemHeader; |
232 | 232 | } |
233 | 233 | |
234 | - public function setHasContainer(){ |
|
235 | - return $this->wrapContent("<div class='ui container'>","</div>"); |
|
234 | + public function setHasContainer() { |
|
235 | + return $this->wrapContent("<div class='ui container'>", "</div>"); |
|
236 | 236 | } |
237 | 237 | |
238 | - public function run(JsUtils $js){ |
|
239 | - if($this->identifier!=="" && !isset($this->_bsComponent)) |
|
240 | - $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}',false,false); |
|
241 | - $result= parent::run($js); |
|
238 | + public function run(JsUtils $js) { |
|
239 | + if ($this->identifier!=="" && !isset($this->_bsComponent)) |
|
240 | + $this->onClick('if(!$(this).hasClass("dropdown")&&!$(this).hasClass("no-active")){$(this).addClass("active").siblings().removeClass("active");}', false, false); |
|
241 | + $result=parent::run($js); |
|
242 | 242 | return $result->setItemSelector(".item"); |
243 | 243 | } |
244 | 244 | } |