@@ -13,7 +13,7 @@ |
||
13 | 13 | $viewVars=$view->viewVars; |
14 | 14 | if (isset($viewVars["q"]) === false) { |
15 | 15 | $controls=array (); |
16 | - }else{ |
|
16 | + } else{ |
|
17 | 17 | $controls=$viewVars["q"]; |
18 | 18 | } |
19 | 19 | $controls[$identifier]=$content; |
@@ -8,23 +8,23 @@ discard block |
||
8 | 8 | use Cake\Network\Response; |
9 | 9 | use Cake\Core\App; |
10 | 10 | |
11 | -class _JsUtils extends \Ajax\JsUtils{ |
|
12 | - public function getUrl($url){ |
|
11 | +class _JsUtils extends \Ajax\JsUtils { |
|
12 | + public function getUrl($url) { |
|
13 | 13 | return Router::url($url); |
14 | 14 | } |
15 | - public function addViewElement($identifier,$content,&$view){ |
|
15 | + public function addViewElement($identifier, $content, &$view) { |
|
16 | 16 | $viewVars=$view->viewVars; |
17 | - if (isset($viewVars["q"]) === false) { |
|
18 | - $controls=array (); |
|
19 | - }else{ |
|
17 | + if (isset($viewVars["q"])===false) { |
|
18 | + $controls=array(); |
|
19 | + } else { |
|
20 | 20 | $controls=$viewVars["q"]; |
21 | 21 | } |
22 | 22 | $controls[$identifier]=$content; |
23 | 23 | $view->set("q", $controls); |
24 | 24 | } |
25 | 25 | |
26 | - public function createScriptVariable(&$view,$view_var, $output){ |
|
27 | - $view->set($view_var,$output); |
|
26 | + public function createScriptVariable(&$view, $view_var, $output) { |
|
27 | + $view->set($view_var, $output); |
|
28 | 28 | } |
29 | 29 | |
30 | 30 | /** |
@@ -34,18 +34,18 @@ discard block |
||
34 | 34 | * @param array $params |
35 | 35 | * @see \Ajax\JsUtils::forward() |
36 | 36 | */ |
37 | - public function forward($initialControllerInstance,$controllerName,$actionName,$params=array()){ |
|
37 | + public function forward($initialControllerInstance, $controllerName, $actionName, $params=array()) { |
|
38 | 38 | \ob_start(); |
39 | - if(isset($params) && !\is_array($params)){ |
|
39 | + if (isset($params) && !\is_array($params)) { |
|
40 | 40 | $params=[$params]; |
41 | 41 | } |
42 | 42 | $url=h(Router::url(\array_merge([ |
43 | 43 | 'controller' => $controllerName, |
44 | - 'action' => $actionName],$params),false |
|
44 | + 'action' => $actionName], $params), false |
|
45 | 45 | )); |
46 | 46 | $base=Router::url("/"); |
47 | - if (substr($url, 0, strlen($base)) == $base) { |
|
48 | - $url = substr($url, strlen($base)); |
|
47 | + if (substr($url, 0, strlen($base))==$base) { |
|
48 | + $url=substr($url, strlen($base)); |
|
49 | 49 | } |
50 | 50 | $initialControllerInstance->requestAction($url); |
51 | 51 | $result=\ob_get_contents(); |
@@ -53,17 +53,17 @@ discard block |
||
53 | 53 | return $result; |
54 | 54 | } |
55 | 55 | |
56 | - public function renderContent($initialControllerInstance,$viewName, $params=NULL) { |
|
57 | - $view = new View(Router::getRequest(true), new Response()); |
|
58 | - if(\is_array($params)){ |
|
59 | - foreach ($params as $k=>$v){ |
|
56 | + public function renderContent($initialControllerInstance, $viewName, $params=NULL) { |
|
57 | + $view=new View(Router::getRequest(true), new Response()); |
|
58 | + if (\is_array($params)) { |
|
59 | + foreach ($params as $k=>$v) { |
|
60 | 60 | $view->set($k, $v); |
61 | 61 | } |
62 | 62 | } |
63 | 63 | return $view->render($viewName); |
64 | 64 | } |
65 | 65 | |
66 | - public function fromDispatcher($dispatcher){ |
|
66 | + public function fromDispatcher($dispatcher) { |
|
67 | 67 | return \explode("/", Router::getRequest(true)->url); |
68 | 68 | } |
69 | 69 | } |
@@ -11,10 +11,10 @@ |
||
11 | 11 | * @var Ajax\php\cakephp\_JsUtils |
12 | 12 | */ |
13 | 13 | public $jquery; |
14 | - public function initialize(array $config){ |
|
14 | + public function initialize(array $config) { |
|
15 | 15 | \extract($config); |
16 | 16 | $this->jquery=new _JsUtils(); |
17 | - if(isset($semantic)){ |
|
17 | + if (isset($semantic)) { |
|
18 | 18 | $this->jquery->semantic(new Semantic()); |
19 | 19 | } |
20 | 20 | } |
@@ -17,12 +17,15 @@ discard block |
||
17 | 17 | parent::__construct($identifier, "a"); |
18 | 18 | $this->setClass("item"); |
19 | 19 | $this->setContent($content); |
20 | - if($value!==NULL) |
|
21 | - $this->setData($value); |
|
22 | - if($image!==NULL) |
|
23 | - $this->asMiniAvatar($image); |
|
24 | - if($description!==NULL) |
|
25 | - $this->setDescription($description); |
|
20 | + if($value!==NULL) { |
|
21 | + $this->setData($value); |
|
22 | + } |
|
23 | + if($image!==NULL) { |
|
24 | + $this->asMiniAvatar($image); |
|
25 | + } |
|
26 | + if($description!==NULL) { |
|
27 | + $this->setDescription($description); |
|
28 | + } |
|
26 | 29 | } |
27 | 30 | |
28 | 31 | public function setDescription($description){ |
@@ -39,8 +42,9 @@ discard block |
||
39 | 42 | |
40 | 43 | public function asOption(){ |
41 | 44 | $this->tagName="option"; |
42 | - if($this->getProperty("data-value")!==null) |
|
43 | - $this->setProperty("value", $this->getProperty("data-value")); |
|
45 | + if($this->getProperty("data-value")!==null) { |
|
46 | + $this->setProperty("value", $this->getProperty("data-value")); |
|
47 | + } |
|
44 | 48 | } |
45 | 49 | |
46 | 50 | /** |
@@ -12,34 +12,34 @@ discard block |
||
12 | 12 | use Ajax\semantic\html\base\traits\MenuItemTrait; |
13 | 13 | |
14 | 14 | class HtmlDropdownItem extends HtmlSemDoubleElement { |
15 | - use IconTrait,MenuItemTrait; |
|
16 | - public function __construct($identifier, $content="",$value=NULL,$image=NULL,$description=NULL) { |
|
15 | + use IconTrait, MenuItemTrait; |
|
16 | + public function __construct($identifier, $content="", $value=NULL, $image=NULL, $description=NULL) { |
|
17 | 17 | parent::__construct($identifier, "a"); |
18 | 18 | $this->setClass("item"); |
19 | 19 | $this->setContent($content); |
20 | - if($value!==NULL) |
|
20 | + if ($value!==NULL) |
|
21 | 21 | $this->setData($value); |
22 | - if($image!==NULL) |
|
22 | + if ($image!==NULL) |
|
23 | 23 | $this->asMiniAvatar($image); |
24 | - if($description!==NULL) |
|
24 | + if ($description!==NULL) |
|
25 | 25 | $this->setDescription($description); |
26 | 26 | } |
27 | 27 | |
28 | - public function setDescription($description){ |
|
29 | - $descO=new HtmlDoubleElement("desc-".$this->identifier,"span"); |
|
28 | + public function setDescription($description) { |
|
29 | + $descO=new HtmlDoubleElement("desc-".$this->identifier, "span"); |
|
30 | 30 | $descO->setClass("description"); |
31 | 31 | $descO->setContent($description); |
32 | - return $this->addContent($descO,true); |
|
32 | + return $this->addContent($descO, true); |
|
33 | 33 | } |
34 | 34 | |
35 | - public function setData($value){ |
|
35 | + public function setData($value) { |
|
36 | 36 | $this->setProperty("data-value", $value); |
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function asOption(){ |
|
40 | + public function asOption() { |
|
41 | 41 | $this->tagName="option"; |
42 | - if($this->getProperty("data-value")!==null) |
|
42 | + if ($this->getProperty("data-value")!==null) |
|
43 | 43 | $this->setProperty("value", $this->getProperty("data-value")); |
44 | 44 | } |
45 | 45 | |
@@ -47,11 +47,11 @@ discard block |
||
47 | 47 | * @param string $image the image src |
48 | 48 | * @return \Ajax\common\html\html5\HtmlImg |
49 | 49 | */ |
50 | - public function asMiniAvatar($image){ |
|
50 | + public function asMiniAvatar($image) { |
|
51 | 51 | $this->tagName="div"; |
52 | - $img=new HtmlImg("image-".$this->identifier,$image); |
|
52 | + $img=new HtmlImg("image-".$this->identifier, $image); |
|
53 | 53 | $img->setClass("ui mini avatar image"); |
54 | - $this->addContent($img,true); |
|
54 | + $this->addContent($img, true); |
|
55 | 55 | return $this; |
56 | 56 | } |
57 | 57 | |
@@ -60,9 +60,9 @@ discard block |
||
60 | 60 | * @param string $icon |
61 | 61 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
62 | 62 | */ |
63 | - public function asIcon($caption,$icon){ |
|
63 | + public function asIcon($caption, $icon) { |
|
64 | 64 | $this->setContent($caption); |
65 | - $this->addContent(new HtmlIcon("", $icon),true); |
|
65 | + $this->addContent(new HtmlIcon("", $icon), true); |
|
66 | 66 | return $this; |
67 | 67 | } |
68 | 68 | |
@@ -71,23 +71,23 @@ discard block |
||
71 | 71 | * @param string $color |
72 | 72 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
73 | 73 | */ |
74 | - public function asCircularLabel($caption,$color){ |
|
74 | + public function asCircularLabel($caption, $color) { |
|
75 | 75 | $this->setContent($caption); |
76 | 76 | $lbl=new HtmlLabel(""); |
77 | 77 | $lbl->setCircular()->setColor($color)->setEmpty(); |
78 | - $this->addContent($lbl,true); |
|
78 | + $this->addContent($lbl, true); |
|
79 | 79 | return $this; |
80 | 80 | } |
81 | 81 | |
82 | 82 | |
83 | 83 | |
84 | 84 | public function addMenuItem($items) { |
85 | - $menu=new HtmlMenu("menu-" . $this->identifier, $items); |
|
85 | + $menu=new HtmlMenu("menu-".$this->identifier, $items); |
|
86 | 86 | $content=$this->content; |
87 | 87 | $this->setTagName("div"); |
88 | 88 | $this->setProperty("class", "item"); |
89 | 89 | $icon=new HtmlIcon("", "dropdown"); |
90 | - $this->content=[$icon,new HtmlSemDoubleElement("","span","text",$content),$menu]; |
|
90 | + $this->content=[$icon, new HtmlSemDoubleElement("", "span", "text", $content), $menu]; |
|
91 | 91 | return $menu; |
92 | 92 | } |
93 | 93 | |
@@ -96,14 +96,14 @@ discard block |
||
96 | 96 | * @param string $icon |
97 | 97 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
98 | 98 | */ |
99 | - public static function searchInput($placeholder=NULL,$icon=NULL){ |
|
100 | - return (new HtmlDropdownItem(""))->asSearchInput($placeholder,$icon); |
|
99 | + public static function searchInput($placeholder=NULL, $icon=NULL) { |
|
100 | + return (new HtmlDropdownItem(""))->asSearchInput($placeholder, $icon); |
|
101 | 101 | } |
102 | 102 | |
103 | 103 | /** |
104 | 104 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
105 | 105 | */ |
106 | - public static function divider(){ |
|
106 | + public static function divider() { |
|
107 | 107 | return (new HtmlDropdownItem(""))->asDivider(); |
108 | 108 | } |
109 | 109 | |
@@ -112,8 +112,8 @@ discard block |
||
112 | 112 | * @param string $icon |
113 | 113 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
114 | 114 | */ |
115 | - public static function header($caption=NULL,$icon=NULL){ |
|
116 | - return (new HtmlDropdownItem(""))->asHeader($caption,$icon); |
|
115 | + public static function header($caption=NULL, $icon=NULL) { |
|
116 | + return (new HtmlDropdownItem(""))->asHeader($caption, $icon); |
|
117 | 117 | } |
118 | 118 | |
119 | 119 | /** |
@@ -121,8 +121,8 @@ discard block |
||
121 | 121 | * @param string $color |
122 | 122 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
123 | 123 | */ |
124 | - public static function circular($caption,$color){ |
|
125 | - return (new HtmlDropdownItem(""))->asCircularLabel($caption,$color); |
|
124 | + public static function circular($caption, $color) { |
|
125 | + return (new HtmlDropdownItem(""))->asCircularLabel($caption, $color); |
|
126 | 126 | } |
127 | 127 | |
128 | 128 | /** |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | * @param string $icon |
131 | 131 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
132 | 132 | */ |
133 | - public static function icon($caption,$icon){ |
|
134 | - return (new HtmlDropdownItem(""))->asIcon($caption,$icon); |
|
133 | + public static function icon($caption, $icon) { |
|
134 | + return (new HtmlDropdownItem(""))->asIcon($caption, $icon); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @param unknown $image |
140 | 140 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
141 | 141 | */ |
142 | - public static function avatar($caption,$image){ |
|
143 | - return (new HtmlDropdownItem("",$caption))->asMiniAvatar($image); |
|
142 | + public static function avatar($caption, $image) { |
|
143 | + return (new HtmlDropdownItem("", $caption))->asMiniAvatar($image); |
|
144 | 144 | } |
145 | 145 | } |
@@ -5,13 +5,13 @@ |
||
5 | 5 | |
6 | 6 | class HtmlShapeItem extends HtmlSemDoubleElement { |
7 | 7 | public function __construct($identifier, $content) { |
8 | - parent::__construct($identifier,"div","side",$content); |
|
8 | + parent::__construct($identifier, "div", "side", $content); |
|
9 | 9 | } |
10 | 10 | |
11 | - public function setActive($value=true){ |
|
12 | - if($value){ |
|
11 | + public function setActive($value=true) { |
|
12 | + if ($value) { |
|
13 | 13 | $this->addToPropertyCtrl("class", "active", ["active"]); |
14 | - }else{ |
|
14 | + } else { |
|
15 | 15 | $this->removePropertyValue("class", "active"); |
16 | 16 | } |
17 | 17 | return $this; |
@@ -4,6 +4,10 @@ |
||
4 | 4 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
5 | 5 | |
6 | 6 | class HtmlShapeItem extends HtmlSemDoubleElement { |
7 | + |
|
8 | + /** |
|
9 | + * @param string $identifier |
|
10 | + */ |
|
7 | 11 | public function __construct($identifier, $content) { |
8 | 12 | parent::__construct($identifier,"div","side",$content); |
9 | 13 | } |
@@ -11,7 +11,7 @@ |
||
11 | 11 | public function setActive($value=true){ |
12 | 12 | if($value){ |
13 | 13 | $this->addToPropertyCtrl("class", "active", ["active"]); |
14 | - }else{ |
|
14 | + } else{ |
|
15 | 15 | $this->removePropertyValue("class", "active"); |
16 | 16 | } |
17 | 17 | return $this; |
@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | * @param int $colCount |
19 | 19 | * @return HtmlTable |
20 | 20 | */ |
21 | - public function htmlTable($identifier, $rowCount, $colCount){ |
|
21 | + public function htmlTable($identifier, $rowCount, $colCount) { |
|
22 | 22 | return $this->addHtmlComponent(new HtmlTable($identifier, $rowCount, $colCount)); |
23 | 23 | } |
24 | 24 | |
@@ -29,9 +29,9 @@ discard block |
||
29 | 29 | * @param $styles string|array|NULL |
30 | 30 | * @return HtmlMessage |
31 | 31 | */ |
32 | - public function htmlMessage($identifier, $content="",$styles=NULL) { |
|
33 | - $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | - if(isset($msg)) |
|
32 | + public function htmlMessage($identifier, $content="", $styles=NULL) { |
|
33 | + $msg=$this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
|
34 | + if (isset($msg)) |
|
35 | 35 | $msg->setStyle($styles); |
36 | 36 | return $msg; |
37 | 37 | } |
@@ -31,8 +31,9 @@ |
||
31 | 31 | */ |
32 | 32 | public function htmlMessage($identifier, $content="",$styles=NULL) { |
33 | 33 | $msg= $this->addHtmlComponent(new HtmlMessage($identifier, $content)); |
34 | - if(isset($msg)) |
|
35 | - $msg->setStyle($styles); |
|
34 | + if(isset($msg)) { |
|
35 | + $msg->setStyle($styles); |
|
36 | + } |
|
36 | 37 | return $msg; |
37 | 38 | } |
38 | 39 |
@@ -127,8 +127,8 @@ discard block |
||
127 | 127 | * @param string|array $params |
128 | 128 | * @return Modal |
129 | 129 | */ |
130 | - public function modal($attachTo=NULL, $params=NULL,$paramsParts=NULL) { |
|
131 | - $result= $this->addComponent(new Modal($this->js), $attachTo, $params); |
|
130 | + public function modal($attachTo=NULL, $params=NULL, $paramsParts=NULL) { |
|
131 | + $result=$this->addComponent(new Modal($this->js), $attachTo, $params); |
|
132 | 132 | $result->setParamParts($paramsParts); |
133 | 133 | return $result; |
134 | 134 | } |
@@ -139,7 +139,7 @@ discard block |
||
139 | 139 | * @return Tab |
140 | 140 | */ |
141 | 141 | public function tab($attachTo=NULL, $params=NULL) { |
142 | - $result= $this->addComponent(new Tab($this->js), $attachTo, $params); |
|
142 | + $result=$this->addComponent(new Tab($this->js), $attachTo, $params); |
|
143 | 143 | return $result; |
144 | 144 | } |
145 | 145 | |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @return Shape |
150 | 150 | */ |
151 | 151 | public function shape($attachTo=NULL, $params=NULL) { |
152 | - $result= $this->addComponent(new Shape($this->js), $attachTo, $params); |
|
152 | + $result=$this->addComponent(new Shape($this->js), $attachTo, $params); |
|
153 | 153 | return $result; |
154 | 154 | } |
155 | 155 | |
@@ -159,7 +159,7 @@ discard block |
||
159 | 159 | * @return Form |
160 | 160 | */ |
161 | 161 | public function form($attachTo=NULL, $params=NULL) { |
162 | - $result= $this->addComponent(new Form($this->js), $attachTo, $params); |
|
162 | + $result=$this->addComponent(new Form($this->js), $attachTo, $params); |
|
163 | 163 | return $result; |
164 | 164 | } |
165 | 165 |
@@ -12,9 +12,9 @@ discard block |
||
12 | 12 | $this->paramParts=array(); |
13 | 13 | } |
14 | 14 | |
15 | - protected function generateParamParts(){ |
|
15 | + protected function generateParamParts() { |
|
16 | 16 | $results=[]; |
17 | - foreach ($this->paramParts as $paramPart){ |
|
17 | + foreach ($this->paramParts as $paramPart) { |
|
18 | 18 | $results[]="{$this->uiName}(".\implode(",", $paramPart).")"; |
19 | 19 | } |
20 | 20 | return \implode(".", $results); |
@@ -22,9 +22,9 @@ discard block |
||
22 | 22 | |
23 | 23 | public function getScript() { |
24 | 24 | $allParams=$this->params; |
25 | - $this->jquery_code_for_compile=array (); |
|
25 | + $this->jquery_code_for_compile=array(); |
|
26 | 26 | $paramParts=""; |
27 | - if(\sizeof($this->paramParts)>0){ |
|
27 | + if (\sizeof($this->paramParts)>0) { |
|
28 | 28 | $paramParts=".".$this->generateParamParts(); |
29 | 29 | } |
30 | 30 | $this->jquery_code_for_compile []="$( \"".$this->attachTo."\" ).{$this->uiName}(".$this->getParamsAsJSON($allParams).")".$paramParts.";"; |
@@ -37,8 +37,8 @@ discard block |
||
37 | 37 | return $this; |
38 | 38 | } |
39 | 39 | |
40 | - public function addComponentEvent($event,$jsCode){ |
|
41 | - $jsCode=str_ireplace("\"","%quote%", $jsCode); |
|
40 | + public function addComponentEvent($event, $jsCode) { |
|
41 | + $jsCode=str_ireplace("\"", "%quote%", $jsCode); |
|
42 | 42 | return $this->setParam($event, "%function(){".$jsCode."}%"); |
43 | 43 | } |
44 | 44 |
@@ -55,10 +55,12 @@ discard block |
||
55 | 55 | |
56 | 56 | public function jsonSerialize() { |
57 | 57 | $result= ["type"=>$this->type]; |
58 | - if(isset($this->prompt)) |
|
59 | - $result["prompt"]=$this->prompt; |
|
60 | - if(isset($this->value)) |
|
61 | - $result["value"]=$this->value; |
|
58 | + if(isset($this->prompt)) { |
|
59 | + $result["prompt"]=$this->prompt; |
|
60 | + } |
|
61 | + if(isset($this->value)) { |
|
62 | + $result["value"]=$this->value; |
|
63 | + } |
|
62 | 64 | return $result; |
63 | 65 | } |
64 | 66 | |
@@ -90,8 +92,9 @@ discard block |
||
90 | 92 | * @return \Ajax\semantic\components\validation\Rule |
91 | 93 | */ |
92 | 94 | public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
93 | - if(\is_int($min) && \is_int($max)) |
|
94 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
95 | + if(\is_int($min) && \is_int($max)) { |
|
96 | + return new Rule("integer[{$min}..{$max}]",$prompt); |
|
97 | + } |
|
95 | 98 | return new Rule("integer",$prompt); |
96 | 99 | } |
97 | 100 |
@@ -8,7 +8,7 @@ discard block |
||
8 | 8 | * @version 1.001 |
9 | 9 | * Generates a JSON Rule for the validation of a field |
10 | 10 | */ |
11 | -class Rule implements \JsonSerializable{ |
|
11 | +class Rule implements \JsonSerializable { |
|
12 | 12 | /** |
13 | 13 | * @var string |
14 | 14 | */ |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | */ |
24 | 24 | private $value; |
25 | 25 | |
26 | - public function __construct($type,$prompt=NULL,$value=NULL){ |
|
26 | + public function __construct($type, $prompt=NULL, $value=NULL) { |
|
27 | 27 | $this->type=$type; |
28 | 28 | $this->prompt=$prompt; |
29 | 29 | $this->value=$value; |
@@ -57,10 +57,10 @@ discard block |
||
57 | 57 | } |
58 | 58 | |
59 | 59 | public function jsonSerialize() { |
60 | - $result= ["type"=>$this->type]; |
|
61 | - if(isset($this->prompt)) |
|
60 | + $result=["type"=>$this->type]; |
|
61 | + if (isset($this->prompt)) |
|
62 | 62 | $result["prompt"]=$this->prompt; |
63 | - if(isset($this->value)) |
|
63 | + if (isset($this->value)) |
|
64 | 64 | $result["value"]=$this->value; |
65 | 65 | return $result; |
66 | 66 | } |
@@ -71,8 +71,8 @@ discard block |
||
71 | 71 | * @param string $prompt |
72 | 72 | * @return \Ajax\semantic\components\validation\Rule |
73 | 73 | */ |
74 | - public static function match($name,$prompt=NULL){ |
|
75 | - return new Rule("match[".$name."]",$prompt); |
|
74 | + public static function match($name, $prompt=NULL) { |
|
75 | + return new Rule("match[".$name."]", $prompt); |
|
76 | 76 | } |
77 | 77 | |
78 | 78 | /** |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | * @param string $prompt |
82 | 82 | * @return \Ajax\semantic\components\validation\Rule |
83 | 83 | */ |
84 | - public static function different($name,$prompt=NULL){ |
|
85 | - return new Rule("different[".$name."]",$prompt); |
|
84 | + public static function different($name, $prompt=NULL) { |
|
85 | + return new Rule("different[".$name."]", $prompt); |
|
86 | 86 | } |
87 | 87 | |
88 | 88 | /** |
@@ -92,82 +92,82 @@ discard block |
||
92 | 92 | * @param string $prompt |
93 | 93 | * @return \Ajax\semantic\components\validation\Rule |
94 | 94 | */ |
95 | - public static function integer($min=NULL,$max=NULL,$prompt=NULL){ |
|
96 | - if(\is_int($min) && \is_int($max)) |
|
97 | - return new Rule("integer[{$min}..{$max}]",$prompt); |
|
98 | - return new Rule("integer",$prompt); |
|
95 | + public static function integer($min=NULL, $max=NULL, $prompt=NULL) { |
|
96 | + if (\is_int($min) && \is_int($max)) |
|
97 | + return new Rule("integer[{$min}..{$max}]", $prompt); |
|
98 | + return new Rule("integer", $prompt); |
|
99 | 99 | } |
100 | 100 | |
101 | - public static function decimal($prompt=NULL){ |
|
102 | - return new Rule("decimal",$prompt); |
|
101 | + public static function decimal($prompt=NULL) { |
|
102 | + return new Rule("decimal", $prompt); |
|
103 | 103 | } |
104 | 104 | |
105 | - public static function number($prompt=NULL){ |
|
106 | - return new Rule("number",$prompt); |
|
105 | + public static function number($prompt=NULL) { |
|
106 | + return new Rule("number", $prompt); |
|
107 | 107 | } |
108 | 108 | |
109 | - public static function is($value,$prompt=NULL){ |
|
110 | - return new Rule("is[".$value."]",$prompt); |
|
109 | + public static function is($value, $prompt=NULL) { |
|
110 | + return new Rule("is[".$value."]", $prompt); |
|
111 | 111 | } |
112 | 112 | |
113 | - public static function isExactly($value,$prompt=NULL){ |
|
114 | - return new Rule("isExactly[".$value."]",$prompt); |
|
113 | + public static function isExactly($value, $prompt=NULL) { |
|
114 | + return new Rule("isExactly[".$value."]", $prompt); |
|
115 | 115 | } |
116 | 116 | |
117 | - public static function not($value,$prompt=NULL){ |
|
118 | - return new Rule("not[".$value."]",$prompt); |
|
117 | + public static function not($value, $prompt=NULL) { |
|
118 | + return new Rule("not[".$value."]", $prompt); |
|
119 | 119 | } |
120 | 120 | |
121 | - public static function notExactly($value,$prompt=NULL){ |
|
122 | - return new Rule("notExactly[".$value."]",$prompt); |
|
121 | + public static function notExactly($value, $prompt=NULL) { |
|
122 | + return new Rule("notExactly[".$value."]", $prompt); |
|
123 | 123 | } |
124 | 124 | |
125 | - public static function contains($value,$prompt=NULL){ |
|
126 | - return new Rule("contains[".$value."]",$prompt); |
|
125 | + public static function contains($value, $prompt=NULL) { |
|
126 | + return new Rule("contains[".$value."]", $prompt); |
|
127 | 127 | } |
128 | 128 | |
129 | - public static function containsExactly($value,$prompt=NULL){ |
|
130 | - return new Rule("containsExactly[".$value."]",$prompt); |
|
129 | + public static function containsExactly($value, $prompt=NULL) { |
|
130 | + return new Rule("containsExactly[".$value."]", $prompt); |
|
131 | 131 | } |
132 | 132 | |
133 | - public static function doesntContain($value,$prompt=NULL){ |
|
134 | - return new Rule("doesntContain[".$value."]",$prompt); |
|
133 | + public static function doesntContain($value, $prompt=NULL) { |
|
134 | + return new Rule("doesntContain[".$value."]", $prompt); |
|
135 | 135 | } |
136 | 136 | |
137 | - public static function doesntContainExactly($value,$prompt=NULL){ |
|
138 | - return new Rule("doesntContainExactly[".$value."]",$prompt); |
|
137 | + public static function doesntContainExactly($value, $prompt=NULL) { |
|
138 | + return new Rule("doesntContainExactly[".$value."]", $prompt); |
|
139 | 139 | } |
140 | 140 | |
141 | - public static function minCount($value,$prompt=NULL){ |
|
142 | - return new Rule("minCount[".$value."]",$prompt); |
|
141 | + public static function minCount($value, $prompt=NULL) { |
|
142 | + return new Rule("minCount[".$value."]", $prompt); |
|
143 | 143 | } |
144 | 144 | |
145 | - public static function maxCount($value,$prompt=NULL){ |
|
146 | - return new Rule("maxCount[".$value."]",$prompt); |
|
145 | + public static function maxCount($value, $prompt=NULL) { |
|
146 | + return new Rule("maxCount[".$value."]", $prompt); |
|
147 | 147 | } |
148 | 148 | |
149 | - public static function exactCount($value,$prompt=NULL){ |
|
150 | - return new Rule("exactCount[".$value."]",$prompt); |
|
149 | + public static function exactCount($value, $prompt=NULL) { |
|
150 | + return new Rule("exactCount[".$value."]", $prompt); |
|
151 | 151 | } |
152 | 152 | |
153 | - public static function email($prompt=NULL){ |
|
154 | - return new Rule("email",$prompt); |
|
153 | + public static function email($prompt=NULL) { |
|
154 | + return new Rule("email", $prompt); |
|
155 | 155 | } |
156 | 156 | |
157 | - public static function url($prompt=NULL){ |
|
158 | - return new Rule("url",$prompt); |
|
157 | + public static function url($prompt=NULL) { |
|
158 | + return new Rule("url", $prompt); |
|
159 | 159 | } |
160 | 160 | |
161 | - public static function regExp($value,$prompt=NULL){ |
|
162 | - return new Rule("regExp",$prompt,$value); |
|
161 | + public static function regExp($value, $prompt=NULL) { |
|
162 | + return new Rule("regExp", $prompt, $value); |
|
163 | 163 | } |
164 | 164 | |
165 | - public static function custom($name,$jsFunction){ |
|
166 | - return "$.fn.form.settings.rules.".$name." =".$jsFunction ; |
|
165 | + public static function custom($name, $jsFunction) { |
|
166 | + return "$.fn.form.settings.rules.".$name." =".$jsFunction; |
|
167 | 167 | } |
168 | 168 | |
169 | - public static function ajax(JsUtils $js,$name,$url,$params,$jsCallback,$method="post",$parameters=[]){ |
|
170 | - $parameters=\array_merge(["async"=>false,"url"=>$url,"params"=>$params,"hasLoader"=>false,"jsCallback"=>$jsCallback,"dataType"=>"json","stopPropagation"=>false,"preventDefault"=>false,"responseElement"=>null],$parameters); |
|
169 | + public static function ajax(JsUtils $js, $name, $url, $params, $jsCallback, $method="post", $parameters=[]) { |
|
170 | + $parameters=\array_merge(["async"=>false, "url"=>$url, "params"=>$params, "hasLoader"=>false, "jsCallback"=>$jsCallback, "dataType"=>"json", "stopPropagation"=>false, "preventDefault"=>false, "responseElement"=>null], $parameters); |
|
171 | 171 | $ajax=new AjaxCall($method, $parameters); |
172 | 172 | return self::custom($name, "function(value){var result=true;".$ajax->compile($js)."return result;}"); |
173 | 173 | } |
@@ -18,11 +18,12 @@ |
||
18 | 18 | if(\is_array($value)){ |
19 | 19 | $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
20 | 20 | return $itemO; |
21 | - }elseif(\is_object($value)){ |
|
21 | + } elseif(\is_object($value)){ |
|
22 | 22 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
23 | 23 | return $itemO; |
24 | - }else |
|
25 | - return new HtmlFormInput($value); |
|
24 | + } else { |
|
25 | + return new HtmlFormInput($value); |
|
26 | + } |
|
26 | 27 | } |
27 | 28 | |
28 | 29 | protected function createCondition($value){ |
@@ -10,7 +10,6 @@ |
||
10 | 10 | use Ajax\semantic\html\collections\form\HtmlFormRadio; |
11 | 11 | use Ajax\semantic\html\collections\form\HtmlFormField; |
12 | 12 | use Ajax\common\html\html5\HtmlTextarea; |
13 | -use Ajax\common\html\HtmlDoubleElement; |
|
14 | 13 | use Ajax\semantic\html\collections\form\HtmlFormTextarea; |
15 | 14 | use Ajax\semantic\html\base\HtmlSemDoubleElement; |
16 | 15 | use Ajax\semantic\html\elements\HtmlButtonGroups; |
@@ -20,46 +20,46 @@ discard block |
||
20 | 20 | * @property string $identifier |
21 | 21 | */ |
22 | 22 | trait FieldsTrait { |
23 | - abstract public function addFields($fields=NULL,$label=NULL); |
|
23 | + abstract public function addFields($fields=NULL, $label=NULL); |
|
24 | 24 | abstract public function addItem($item); |
25 | 25 | |
26 | - protected function createItem($value){ |
|
27 | - if(\is_array($value)){ |
|
28 | - $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id",""),JArray::getDefaultValue($value, "label",null),JArray::getDefaultValue($value, "type", "text"),JArray::getDefaultValue($value, "value",""),JArray::getDefaultValue($value, "placeholder",JArray::getDefaultValue($value, "label",null))); |
|
26 | + protected function createItem($value) { |
|
27 | + if (\is_array($value)) { |
|
28 | + $itemO=new HtmlFormInput(JArray::getDefaultValue($value, "id", ""), JArray::getDefaultValue($value, "label", null), JArray::getDefaultValue($value, "type", "text"), JArray::getDefaultValue($value, "value", ""), JArray::getDefaultValue($value, "placeholder", JArray::getDefaultValue($value, "label", null))); |
|
29 | 29 | return $itemO; |
30 | - }elseif(\is_object($value)){ |
|
30 | + }elseif (\is_object($value)) { |
|
31 | 31 | $itemO=new HtmlFormField("field-".$this->identifier, $value); |
32 | 32 | return $itemO; |
33 | - }else |
|
33 | + } else |
|
34 | 34 | return new HtmlFormInput($value); |
35 | 35 | } |
36 | 36 | |
37 | - protected function createCondition($value){ |
|
37 | + protected function createCondition($value) { |
|
38 | 38 | return \is_object($value)===false || $value instanceof \Ajax\semantic\html\elements\HtmlInput; |
39 | 39 | } |
40 | 40 | |
41 | - public function addInputs($inputs,$fieldslabel=null){ |
|
41 | + public function addInputs($inputs, $fieldslabel=null) { |
|
42 | 42 | $fields=array(); |
43 | - foreach ($inputs as $input){ |
|
43 | + foreach ($inputs as $input) { |
|
44 | 44 | \extract($input); |
45 | - $f=new HtmlFormInput("",""); |
|
45 | + $f=new HtmlFormInput("", ""); |
|
46 | 46 | $f->fromArray($input); |
47 | 47 | $fields[]=$f; |
48 | 48 | } |
49 | - return $this->addFields($fields,$fieldslabel); |
|
49 | + return $this->addFields($fields, $fieldslabel); |
|
50 | 50 | } |
51 | 51 | |
52 | - public function addFieldRule($index,$type,$prompt=NULL,$value=NULL){ |
|
52 | + public function addFieldRule($index, $type, $prompt=NULL, $value=NULL) { |
|
53 | 53 | $field=$this->getItem($index); |
54 | - if(isset($field)){ |
|
55 | - $field->addRule($type,$prompt,$value); |
|
54 | + if (isset($field)) { |
|
55 | + $field->addRule($type, $prompt, $value); |
|
56 | 56 | } |
57 | 57 | return $this; |
58 | 58 | } |
59 | 59 | |
60 | - public function addFieldRules($index,$rules){ |
|
60 | + public function addFieldRules($index, $rules) { |
|
61 | 61 | $field=$this->getItem($index); |
62 | - if(isset($field)){ |
|
62 | + if (isset($field)) { |
|
63 | 63 | $field->addRules($rules); |
64 | 64 | } |
65 | 65 | return $this; |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | * @param boolean $multiple |
75 | 75 | * @return HtmlFormDropdown |
76 | 76 | */ |
77 | - public function addDropdown($identifier,$items=array(), $label=NULL,$value=NULL,$multiple=false){ |
|
78 | - return $this->addItem(new HtmlFormDropdown($identifier,$items,$label,$value,$multiple)); |
|
77 | + public function addDropdown($identifier, $items=array(), $label=NULL, $value=NULL, $multiple=false) { |
|
78 | + return $this->addItem(new HtmlFormDropdown($identifier, $items, $label, $value, $multiple)); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -85,8 +85,8 @@ discard block |
||
85 | 85 | * @param boolean $asIcons |
86 | 86 | * @return HtmlButtonGroups |
87 | 87 | */ |
88 | - public function addButtonGroups($identifier,$elements=[],$asIcons=false){ |
|
89 | - return $this->addItem(new HtmlButtonGroups($identifier,$elements,$asIcons)); |
|
88 | + public function addButtonGroups($identifier, $elements=[], $asIcons=false) { |
|
89 | + return $this->addItem(new HtmlButtonGroups($identifier, $elements, $asIcons)); |
|
90 | 90 | } |
91 | 91 | |
92 | 92 | /** |
@@ -98,8 +98,8 @@ discard block |
||
98 | 98 | * @param string $icon |
99 | 99 | * @return HtmlButtonGroups |
100 | 100 | */ |
101 | - public function addDropdownButton($identifier,$value,$items=[],$asCombo=false,$icon=null){ |
|
102 | - return $this->addItem(HtmlButton::dropdown($identifier, $value,$items,$asCombo,$icon)); |
|
101 | + public function addDropdownButton($identifier, $value, $items=[], $asCombo=false, $icon=null) { |
|
102 | + return $this->addItem(HtmlButton::dropdown($identifier, $value, $items, $asCombo, $icon)); |
|
103 | 103 | } |
104 | 104 | |
105 | 105 | /** |
@@ -110,8 +110,8 @@ discard block |
||
110 | 110 | * @param string $placeholder |
111 | 111 | * @return HtmlFormInput |
112 | 112 | */ |
113 | - public function addInput($identifier, $label=NULL,$type="text",$value=NULL,$placeholder=NULL){ |
|
114 | - return $this->addItem(new HtmlFormInput($identifier,$label,$type,$value,$placeholder)); |
|
113 | + public function addInput($identifier, $label=NULL, $type="text", $value=NULL, $placeholder=NULL) { |
|
114 | + return $this->addItem(new HtmlFormInput($identifier, $label, $type, $value, $placeholder)); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -122,16 +122,16 @@ discard block |
||
122 | 122 | * @param int $rows |
123 | 123 | * @return HtmlTextarea |
124 | 124 | */ |
125 | - public function addTextarea($identifier, $label,$value=NULL,$placeholder=NULL,$rows=5){ |
|
126 | - return $this->addItem(new HtmlFormTextarea($identifier,$label,$value,$placeholder,$rows)); |
|
125 | + public function addTextarea($identifier, $label, $value=NULL, $placeholder=NULL, $rows=5) { |
|
126 | + return $this->addItem(new HtmlFormTextarea($identifier, $label, $value, $placeholder, $rows)); |
|
127 | 127 | } |
128 | 128 | |
129 | - public function addPassword($identifier, $label=NULL){ |
|
130 | - return $this->addItem(new HtmlFormInput($identifier,$label,"password","","")); |
|
129 | + public function addPassword($identifier, $label=NULL) { |
|
130 | + return $this->addItem(new HtmlFormInput($identifier, $label, "password", "", "")); |
|
131 | 131 | } |
132 | 132 | |
133 | - public function addButton($identifier,$value,$cssStyle=NULL,$onClick=NULL){ |
|
134 | - return $this->addItem(new HtmlButton($identifier,$value,$cssStyle,$onClick)); |
|
133 | + public function addButton($identifier, $value, $cssStyle=NULL, $onClick=NULL) { |
|
134 | + return $this->addItem(new HtmlButton($identifier, $value, $cssStyle, $onClick)); |
|
135 | 135 | } |
136 | 136 | |
137 | 137 | /** |
@@ -141,16 +141,16 @@ discard block |
||
141 | 141 | * @param string $type |
142 | 142 | * @return HtmlFormCheckbox |
143 | 143 | */ |
144 | - public function addCheckbox($identifier, $label=NULL,$value=NULL,$type=NULL){ |
|
145 | - return $this->addItem(new HtmlFormCheckbox($identifier,$label,$value,$type)); |
|
144 | + public function addCheckbox($identifier, $label=NULL, $value=NULL, $type=NULL) { |
|
145 | + return $this->addItem(new HtmlFormCheckbox($identifier, $label, $value, $type)); |
|
146 | 146 | } |
147 | 147 | |
148 | - public function addRadio($identifier, $name,$label=NULL,$value=NULL){ |
|
149 | - return $this->addItem(new HtmlFormRadio($identifier,$name,$label,$value)); |
|
148 | + public function addRadio($identifier, $name, $label=NULL, $value=NULL) { |
|
149 | + return $this->addItem(new HtmlFormRadio($identifier, $name, $label, $value)); |
|
150 | 150 | } |
151 | 151 | |
152 | - public function addElement($identifier,$content,$label,$tagName="div",$baseClass=""){ |
|
153 | - $div=new HtmlSemDoubleElement($identifier,$tagName,$baseClass,$content); |
|
154 | - return $this->addItem(new HtmlFormField("field-".$identifier, $div,$label)); |
|
152 | + public function addElement($identifier, $content, $label, $tagName="div", $baseClass="") { |
|
153 | + $div=new HtmlSemDoubleElement($identifier, $tagName, $baseClass, $content); |
|
154 | + return $this->addItem(new HtmlFormField("field-".$identifier, $div, $label)); |
|
155 | 155 | } |
156 | 156 | } |