@@ -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,ruleValue){var result=true;".$ajax->compile($js)."return result;}"); |
| 173 | 173 | } |
@@ -11,14 +11,15 @@ discard block |
||
| 11 | 11 | public function setContent($content){ |
| 12 | 12 | if($content==="-"){ |
| 13 | 13 | $this->asDivider(); |
| 14 | - }elseif($content==="-search-"){ |
|
| 14 | + } elseif($content==="-search-"){ |
|
| 15 | 15 | $values=\explode(",",$content,-1); |
| 16 | 16 | $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
| 17 | - }elseif(JString::startswith($content, "-")){ |
|
| 17 | + } elseif(JString::startswith($content, "-")){ |
|
| 18 | 18 | $content=\ltrim($content,"-"); |
| 19 | 19 | $this->asHeader($content); |
| 20 | - }else |
|
| 21 | - parent::setContent($content); |
|
| 20 | + } else { |
|
| 21 | + parent::setContent($content); |
|
| 22 | + } |
|
| 22 | 23 | return $this; |
| 23 | 24 | } |
| 24 | 25 | |
@@ -30,11 +31,13 @@ discard block |
||
| 30 | 31 | public function asSearchInput($placeholder=NULL,$icon=NULL){ |
| 31 | 32 | $this->setClass("ui icon search input"); |
| 32 | 33 | $input=new HtmlInput("search-".$this->identifier); |
| 33 | - if(isset($placeholder)) |
|
| 34 | - $input->setProperty("placeholder", $placeholder); |
|
| 34 | + if(isset($placeholder)) { |
|
| 35 | + $input->setProperty("placeholder", $placeholder); |
|
| 36 | + } |
|
| 35 | 37 | $this->content=$input; |
| 36 | - if(isset($icon)) |
|
| 37 | - $this->addIcon($icon); |
|
| 38 | + if(isset($icon)) { |
|
| 39 | + $this->addIcon($icon); |
|
| 40 | + } |
|
| 38 | 41 | return $this; |
| 39 | 42 | } |
| 40 | 43 | |
@@ -57,8 +60,9 @@ discard block |
||
| 57 | 60 | $this->setClass("header"); |
| 58 | 61 | $this->tagName="div"; |
| 59 | 62 | $this->content=$caption; |
| 60 | - if(isset($icon)) |
|
| 61 | - $this->addIcon($icon,Direction::LEFT); |
|
| 63 | + if(isset($icon)) { |
|
| 64 | + $this->addIcon($icon,Direction::LEFT); |
|
| 65 | + } |
|
| 62 | 66 | return $this; |
| 63 | 67 | } |
| 64 | 68 | |
@@ -19,16 +19,16 @@ discard block |
||
| 19 | 19 | abstract public function setClass($classNames); |
| 20 | 20 | abstract public function addIcon($icon, $before=true); |
| 21 | 21 | |
| 22 | - public function setContent($content){ |
|
| 23 | - if($content==="-"){ |
|
| 22 | + public function setContent($content) { |
|
| 23 | + if ($content==="-") { |
|
| 24 | 24 | $this->asDivider(); |
| 25 | - }elseif($content==="-search-"){ |
|
| 26 | - $values=\explode(",",$content,-1); |
|
| 27 | - $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."),JArray::getDefaultValue($values, 1, "search")); |
|
| 28 | - }elseif(JString::startswith($content, "-")){ |
|
| 29 | - $content=\ltrim($content,"-"); |
|
| 25 | + }elseif ($content==="-search-") { |
|
| 26 | + $values=\explode(",", $content, -1); |
|
| 27 | + $this->asSearchInput(JArray::getDefaultValue($values, 0, "Search..."), JArray::getDefaultValue($values, 1, "search")); |
|
| 28 | + }elseif (JString::startswith($content, "-")) { |
|
| 29 | + $content=\ltrim($content, "-"); |
|
| 30 | 30 | $this->asHeader($content); |
| 31 | - }else |
|
| 31 | + } else |
|
| 32 | 32 | parent::setContent($content); |
| 33 | 33 | return $this; |
| 34 | 34 | } |
@@ -38,13 +38,13 @@ discard block |
||
| 38 | 38 | * @param string $icon |
| 39 | 39 | * @return HtmlDropdownItem|HtmlMenuItem |
| 40 | 40 | */ |
| 41 | - public function asSearchInput($placeholder=NULL,$icon=NULL){ |
|
| 41 | + public function asSearchInput($placeholder=NULL, $icon=NULL) { |
|
| 42 | 42 | $this->setClass("ui icon search input"); |
| 43 | 43 | $input=new HtmlInput("search-".$this->identifier); |
| 44 | - if(isset($placeholder)) |
|
| 44 | + if (isset($placeholder)) |
|
| 45 | 45 | $input->setProperty("placeholder", $placeholder); |
| 46 | 46 | $this->content=$input; |
| 47 | - if(isset($icon)) |
|
| 47 | + if (isset($icon)) |
|
| 48 | 48 | $this->addIcon($icon); |
| 49 | 49 | return $this; |
| 50 | 50 | } |
@@ -52,7 +52,7 @@ discard block |
||
| 52 | 52 | /** |
| 53 | 53 | * @return HtmlDropdownItem|HtmlMenuItem |
| 54 | 54 | */ |
| 55 | - public function asDivider(){ |
|
| 55 | + public function asDivider() { |
|
| 56 | 56 | $this->content=NULL; |
| 57 | 57 | $this->tagName="div"; |
| 58 | 58 | $this->setClass("divider"); |
@@ -64,16 +64,16 @@ discard block |
||
| 64 | 64 | * @param string $icon |
| 65 | 65 | * @return HtmlDropdownItem|HtmlMenuItem |
| 66 | 66 | */ |
| 67 | - public function asHeader($caption=NULL,$icon=NULL){ |
|
| 67 | + public function asHeader($caption=NULL, $icon=NULL) { |
|
| 68 | 68 | $this->setClass("header"); |
| 69 | 69 | $this->tagName="div"; |
| 70 | 70 | $this->content=$caption; |
| 71 | - if(isset($icon)) |
|
| 72 | - $this->addIcon($icon,Direction::LEFT); |
|
| 71 | + if (isset($icon)) |
|
| 72 | + $this->addIcon($icon, Direction::LEFT); |
|
| 73 | 73 | return $this; |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | - public function setPosition($direction){ |
|
| 77 | - $this->addToProperty("class",$direction); |
|
| 76 | + public function setPosition($direction) { |
|
| 77 | + $this->addToProperty("class", $direction); |
|
| 78 | 78 | } |
| 79 | 79 | } |
@@ -29,12 +29,14 @@ discard block |
||
| 29 | 29 | if (\is_string($end)) { |
| 30 | 30 | $label=$end; |
| 31 | 31 | \array_pop($fields); |
| 32 | - } else |
|
| 33 | - $label=NULL; |
|
| 32 | + } else { |
|
| 33 | + $label=NULL; |
|
| 34 | + } |
|
| 34 | 35 | } |
| 35 | 36 | } |
| 36 | - if (isset($label)) |
|
| 37 | - $this->setLabel($label); |
|
| 37 | + if (isset($label)) { |
|
| 38 | + $this->setLabel($label); |
|
| 39 | + } |
|
| 38 | 40 | foreach ( $fields as $field ) { |
| 39 | 41 | $this->addItem($field); |
| 40 | 42 | } |
@@ -57,8 +59,9 @@ discard block |
||
| 57 | 59 | |
| 58 | 60 | public function addItem($item) { |
| 59 | 61 | $item=parent::addItem($item); |
| 60 | - if($item instanceof HtmlFormField) |
|
| 61 | - $item->setContainer($this); |
|
| 62 | + if($item instanceof HtmlFormField) { |
|
| 63 | + $item->setContainer($this); |
|
| 64 | + } |
|
| 62 | 65 | return $item; |
| 63 | 66 | } |
| 64 | 67 | |
@@ -66,8 +69,9 @@ discard block |
||
| 66 | 69 | if ($this->_equalWidth) { |
| 67 | 70 | $count=$this->count(); |
| 68 | 71 | $this->addToProperty("class", Wide::getConstants()["W".$count]." fields"); |
| 69 | - } else |
|
| 70 | - $this->addToProperty("class", "fields"); |
|
| 72 | + } else { |
|
| 73 | + $this->addToProperty("class", "fields"); |
|
| 74 | + } |
|
| 71 | 75 | return parent::compile($js, $view); |
| 72 | 76 | } |
| 73 | 77 | |
@@ -108,8 +112,9 @@ discard block |
||
| 108 | 112 | $fields[]=$itemO; |
| 109 | 113 | } |
| 110 | 114 | $radios=new HtmlFormFields("fields-".$name, $fields); |
| 111 | - if (isset($label)) |
|
| 112 | - $radios->setLabel($label)->setProperty("for", $name); |
|
| 115 | + if (isset($label)) { |
|
| 116 | + $radios->setLabel($label)->setProperty("for", $name); |
|
| 117 | + } |
|
| 113 | 118 | return $radios; |
| 114 | 119 | } |
| 115 | 120 | |
@@ -124,8 +129,9 @@ discard block |
||
| 124 | 129 | $fields[]=$itemO; |
| 125 | 130 | } |
| 126 | 131 | $radios=new HtmlFormFields("fields-".$name, $fields); |
| 127 | - if (isset($label)) |
|
| 128 | - $radios->setLabel($label)->setProperty("for", $name); |
|
| 132 | + if (isset($label)) { |
|
| 133 | + $radios->setLabel($label)->setProperty("for", $name); |
|
| 134 | + } |
|
| 129 | 135 | return $radios; |
| 130 | 136 | } |
| 131 | 137 | |
@@ -35,7 +35,7 @@ discard block |
||
| 35 | 35 | } |
| 36 | 36 | if (isset($label)) |
| 37 | 37 | $this->setLabel($label); |
| 38 | - foreach ( $fields as $field ) { |
|
| 38 | + foreach ($fields as $field) { |
|
| 39 | 39 | $this->addItem($field); |
| 40 | 40 | } |
| 41 | 41 | return $this; |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | public function addItem($item) { |
| 59 | 59 | $item=parent::addItem($item); |
| 60 | - if($item instanceof HtmlFormField) |
|
| 60 | + if ($item instanceof HtmlFormField) |
|
| 61 | 61 | $item->setContainer($this); |
| 62 | 62 | return $item; |
| 63 | 63 | } |
@@ -65,7 +65,7 @@ discard block |
||
| 65 | 65 | /** |
| 66 | 66 | * @return HtmlFormField |
| 67 | 67 | */ |
| 68 | - public function getItem($index){ |
|
| 68 | + public function getItem($index) { |
|
| 69 | 69 | return parent::getItem($index); |
| 70 | 70 | } |
| 71 | 71 | |
@@ -105,9 +105,9 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | |
| 107 | 107 | public static function radios($name, $items=array(), $label=NULL, $value=null, $type=NULL) { |
| 108 | - $fields=array (); |
|
| 108 | + $fields=array(); |
|
| 109 | 109 | $i=0; |
| 110 | - foreach ( $items as $val => $caption ) { |
|
| 110 | + foreach ($items as $val => $caption) { |
|
| 111 | 111 | $itemO=new HtmlFormRadio($name."-".$i++, $name, $caption, $val, $type); |
| 112 | 112 | if ($val===$value) { |
| 113 | 113 | $itemO->getDataField()->setProperty("checked", ""); |
@@ -121,9 +121,9 @@ discard block |
||
| 121 | 121 | } |
| 122 | 122 | |
| 123 | 123 | public static function checkeds($name, $items=array(), $label=NULL, $values=array(), $type=NULL) { |
| 124 | - $fields=array (); |
|
| 124 | + $fields=array(); |
|
| 125 | 125 | $i=0; |
| 126 | - foreach ( $items as $val => $caption ) { |
|
| 126 | + foreach ($items as $val => $caption) { |
|
| 127 | 127 | $itemO=new HtmlFormCheckbox($name."-".$i++, $caption, $val, $type); |
| 128 | 128 | $itemO->setName($name); |
| 129 | 129 | if (\array_search($val, $values)!==false) { |
@@ -6,19 +6,19 @@ |
||
| 6 | 6 | |
| 7 | 7 | abstract public function getDataField(); |
| 8 | 8 | abstract public function addToProperty($name, $value, $separator=" "); |
| 9 | - public function setPlaceholder($value){ |
|
| 9 | + public function setPlaceholder($value) { |
|
| 10 | 10 | $this->getDataField()->setPlaceholder($value); |
| 11 | 11 | return $this; |
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function setValue($value){ |
|
| 14 | + public function setValue($value) { |
|
| 15 | 15 | $this->getDataField()->setValue($value); |
| 16 | 16 | return $this; |
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function setInputType($type){ |
|
| 20 | - if($type==="hidden") |
|
| 21 | - $this->addToProperty("style","display:none;"); |
|
| 19 | + public function setInputType($type) { |
|
| 20 | + if ($type==="hidden") |
|
| 21 | + $this->addToProperty("style", "display:none;"); |
|
| 22 | 22 | $this->getDataField()->setInputType($type); |
| 23 | 23 | return $this; |
| 24 | 24 | } |
@@ -17,8 +17,9 @@ |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | public function setInputType($type){ |
| 20 | - if($type==="hidden") |
|
| 21 | - $this->addToProperty("style","display:none;"); |
|
| 20 | + if($type==="hidden") { |
|
| 21 | + $this->addToProperty("style","display:none;"); |
|
| 22 | + } |
|
| 22 | 23 | $this->getDataField()->setInputType($type); |
| 23 | 24 | return $this; |
| 24 | 25 | } |
@@ -14,21 +14,24 @@ discard block |
||
| 14 | 14 | return $array[$key]; |
| 15 | 15 | } |
| 16 | 16 | $values=array_values($array); |
| 17 | - if ($pos < sizeof($values)) |
|
| 18 | - return $values[$pos]; |
|
| 17 | + if ($pos < sizeof($values)) { |
|
| 18 | + return $values[$pos]; |
|
| 19 | + } |
|
| 19 | 20 | } |
| 20 | 21 | |
| 21 | 22 | public static function getConditionalValue($array, $key, $condition) { |
| 22 | 23 | $result=NULL; |
| 23 | 24 | if (array_key_exists($key, $array)) { |
| 24 | 25 | $result=$array[$key]; |
| 25 | - if ($condition($result) === true) |
|
| 26 | - return $result; |
|
| 26 | + if ($condition($result) === true) { |
|
| 27 | + return $result; |
|
| 28 | + } |
|
| 27 | 29 | } |
| 28 | 30 | $values=array_values($array); |
| 29 | 31 | foreach ( $values as $val ) { |
| 30 | - if ($condition($val) === true) |
|
| 31 | - return $val; |
|
| 32 | + if ($condition($val) === true) { |
|
| 33 | + return $val; |
|
| 34 | + } |
|
| 32 | 35 | } |
| 33 | 36 | return $result; |
| 34 | 37 | } |
@@ -36,8 +39,9 @@ discard block |
||
| 36 | 39 | public static function getDefaultValue($array, $key, $default=NULL) { |
| 37 | 40 | if (array_key_exists($key, $array)) { |
| 38 | 41 | return $array[$key]; |
| 39 | - } else |
|
| 40 | - return $default; |
|
| 42 | + } else { |
|
| 43 | + return $default; |
|
| 44 | + } |
|
| 41 | 45 | } |
| 42 | 46 | |
| 43 | 47 | public static function implode($glue, $pieces) { |
@@ -84,7 +88,7 @@ discard block |
||
| 84 | 88 | foreach ($objects as $object){ |
| 85 | 89 | $result[]=self::callFunction($object, $modelFunction); |
| 86 | 90 | } |
| 87 | - }else{ |
|
| 91 | + } else{ |
|
| 88 | 92 | foreach ($objects as $object){ |
| 89 | 93 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
| 90 | 94 | } |
@@ -93,9 +97,9 @@ discard block |
||
| 93 | 97 | } |
| 94 | 98 | |
| 95 | 99 | private static function callFunction($object,$callback){ |
| 96 | - if(\is_string($callback)) |
|
| 97 | - return \call_user_func(array($object, $callback),[]); |
|
| 98 | - else if (\is_callable($callback)){ |
|
| 100 | + if(\is_string($callback)) { |
|
| 101 | + return \call_user_func(array($object, $callback),[]); |
|
| 102 | + } else if (\is_callable($callback)){ |
|
| 99 | 103 | return $callback($object); |
| 100 | 104 | } |
| 101 | 105 | } |
@@ -5,7 +5,7 @@ discard block |
||
| 5 | 5 | class JArray { |
| 6 | 6 | |
| 7 | 7 | public static function isAssociative($array) { |
| 8 | - return (array_values($array) !== $array); |
|
| 8 | + return (array_values($array)!==$array); |
|
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | public static function getValue($array, $key, $pos) { |
@@ -13,7 +13,7 @@ discard block |
||
| 13 | 13 | return $array[$key]; |
| 14 | 14 | } |
| 15 | 15 | $values=array_values($array); |
| 16 | - if ($pos < sizeof($values)) |
|
| 16 | + if ($pos<sizeof($values)) |
|
| 17 | 17 | return $values[$pos]; |
| 18 | 18 | } |
| 19 | 19 | |
@@ -21,12 +21,12 @@ discard block |
||
| 21 | 21 | $result=NULL; |
| 22 | 22 | if (array_key_exists($key, $array)) { |
| 23 | 23 | $result=$array[$key]; |
| 24 | - if ($condition($result) === true) |
|
| 24 | + if ($condition($result)===true) |
|
| 25 | 25 | return $result; |
| 26 | 26 | } |
| 27 | 27 | $values=array_values($array); |
| 28 | - foreach ( $values as $val ) { |
|
| 29 | - if ($condition($val) === true) |
|
| 28 | + foreach ($values as $val) { |
|
| 29 | + if ($condition($val)===true) |
|
| 30 | 30 | return $val; |
| 31 | 31 | } |
| 32 | 32 | return $result; |
@@ -43,11 +43,11 @@ discard block |
||
| 43 | 43 | $result=""; |
| 44 | 44 | if (\is_array($glue)) { |
| 45 | 45 | $size=\sizeof($pieces); |
| 46 | - if ($size > 0) { |
|
| 47 | - for($i=0; $i < $size - 1; $i++) { |
|
| 48 | - $result.=$pieces[$i] . @$glue[$i]; |
|
| 46 | + if ($size>0) { |
|
| 47 | + for ($i=0; $i<$size-1; $i++) { |
|
| 48 | + $result.=$pieces[$i].@$glue[$i]; |
|
| 49 | 49 | } |
| 50 | - $result.=$pieces[$size - 1]; |
|
| 50 | + $result.=$pieces[$size-1]; |
|
| 51 | 51 | } |
| 52 | 52 | } else { |
| 53 | 53 | $result=\implode($glue, $pieces); |
@@ -57,7 +57,7 @@ discard block |
||
| 57 | 57 | |
| 58 | 58 | public static function dimension($array) { |
| 59 | 59 | if (\is_array(reset($array))) { |
| 60 | - $return=self::dimension(reset($array)) + 1; |
|
| 60 | + $return=self::dimension(reset($array))+1; |
|
| 61 | 61 | } else { |
| 62 | 62 | $return=1; |
| 63 | 63 | } |
@@ -65,8 +65,8 @@ discard block |
||
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | public static function sortAssociative($array, $sortedKeys=array()) { |
| 68 | - $newArray=array (); |
|
| 69 | - foreach ( $sortedKeys as $key ) { |
|
| 68 | + $newArray=array(); |
|
| 69 | + foreach ($sortedKeys as $key) { |
|
| 70 | 70 | if (\array_key_exists($key, $array)) { |
| 71 | 71 | $newArray[$key]=$array[$key]; |
| 72 | 72 | } |
@@ -76,9 +76,9 @@ discard block |
||
| 76 | 76 | |
| 77 | 77 | public static function moveElementTo(&$array, $from, $to) { |
| 78 | 78 | $result=false; |
| 79 | - if(isset($array)){ |
|
| 80 | - if(isset($array[$from])){ |
|
| 81 | - $out = array_splice($array, $from, 1); |
|
| 79 | + if (isset($array)) { |
|
| 80 | + if (isset($array[$from])) { |
|
| 81 | + $out=array_splice($array, $from, 1); |
|
| 82 | 82 | array_splice($array, $to, 0, $out); |
| 83 | 83 | $result=true; |
| 84 | 84 | } |
@@ -86,10 +86,10 @@ discard block |
||
| 86 | 86 | return $result; |
| 87 | 87 | } |
| 88 | 88 | |
| 89 | - public static function swapElements(&$array,$index1,$index2){ |
|
| 89 | + public static function swapElements(&$array, $index1, $index2) { |
|
| 90 | 90 | $result=false; |
| 91 | - if(isset($array)){ |
|
| 92 | - if(isset($array[$index1])&& isset($array[$index2])){ |
|
| 91 | + if (isset($array)) { |
|
| 92 | + if (isset($array[$index1]) && isset($array[$index2])) { |
|
| 93 | 93 | $tmp=$array[$index1]; |
| 94 | 94 | $array[$index1]=$array[$index2]; |
| 95 | 95 | $array[$index2]=$tmp; |
@@ -100,33 +100,33 @@ discard block |
||
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | - public static function modelArray($objects,$identifierFunction=NULL,$modelFunction=NULL){ |
|
| 103 | + public static function modelArray($objects, $identifierFunction=NULL, $modelFunction=NULL) { |
|
| 104 | 104 | $result=[]; |
| 105 | - if(isset($modelFunction)===false){ |
|
| 105 | + if (isset($modelFunction)===false) { |
|
| 106 | 106 | $modelFunction="__toString"; |
| 107 | 107 | } |
| 108 | - if(isset($identifierFunction)===false){ |
|
| 109 | - foreach ($objects as $object){ |
|
| 108 | + if (isset($identifierFunction)===false) { |
|
| 109 | + foreach ($objects as $object) { |
|
| 110 | 110 | $result[]=self::callFunction($object, $modelFunction); |
| 111 | 111 | } |
| 112 | - }else{ |
|
| 113 | - foreach ($objects as $object){ |
|
| 112 | + } else { |
|
| 113 | + foreach ($objects as $object) { |
|
| 114 | 114 | $result[self::callFunction($object, $identifierFunction)]=self::callFunction($object, $modelFunction); |
| 115 | 115 | } |
| 116 | 116 | } |
| 117 | 117 | return $result; |
| 118 | 118 | } |
| 119 | 119 | |
| 120 | - private static function callFunction($object,$callback){ |
|
| 121 | - if(\is_string($callback)) |
|
| 122 | - return \call_user_func(array($object, $callback),[]); |
|
| 123 | - else if (\is_callable($callback)){ |
|
| 120 | + private static function callFunction($object, $callback) { |
|
| 121 | + if (\is_string($callback)) |
|
| 122 | + return \call_user_func(array($object, $callback), []); |
|
| 123 | + else if (\is_callable($callback)) { |
|
| 124 | 124 | return $callback($object); |
| 125 | 125 | } |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - public static function count($array){ |
|
| 129 | - if(\is_array($array)){ |
|
| 128 | + public static function count($array) { |
|
| 129 | + if (\is_array($array)) { |
|
| 130 | 130 | return \sizeof($array); |
| 131 | 131 | } |
| 132 | 132 | return 0; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | * @return HtmlModal |
| 87 | 87 | */ |
| 88 | 88 | public function htmlModal($identifier, $header="", $content="", $actions=array()) { |
| 89 | - return $this->addHtmlComponent(new HtmlModal($identifier, $header,$content,$actions)); |
|
| 89 | + return $this->addHtmlComponent(new HtmlModal($identifier, $header, $content, $actions)); |
|
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | /** |
@@ -117,8 +117,8 @@ discard block |
||
| 117 | 117 | * @param boolean $associative |
| 118 | 118 | * @return HtmlDropdown |
| 119 | 119 | */ |
| 120 | - public function htmlDropdown($identifier, $value="", $items=array(),$associative=true) { |
|
| 121 | - return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items,$associative)); |
|
| 120 | + public function htmlDropdown($identifier, $value="", $items=array(), $associative=true) { |
|
| 121 | + return $this->addHtmlComponent(new HtmlDropdown($identifier, $value, $items, $associative)); |
|
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | /** |
@@ -50,8 +50,9 @@ |
||
| 50 | 50 | $comp=$item->compile($js); |
| 51 | 51 | if(isset($js)){ |
| 52 | 52 | $bs=$item->run($js); |
| 53 | - if(isset($bs)) |
|
| 54 | - $this->params['onShow']=$bs->getScript(); |
|
| 53 | + if(isset($bs)) { |
|
| 54 | + $this->params['onShow']=$bs->getScript(); |
|
| 55 | + } |
|
| 55 | 56 | } |
| 56 | 57 | $item=$comp; |
| 57 | 58 | } |
@@ -14,64 +14,64 @@ |
||
| 14 | 14 | protected $params; |
| 15 | 15 | protected $semElement; |
| 16 | 16 | |
| 17 | - public function __construct($semElement,$title="",$content="",$variation=NULL,$params=array()){ |
|
| 17 | + public function __construct($semElement, $title="", $content="", $variation=NULL, $params=array()) { |
|
| 18 | 18 | $this->semElement=$semElement; |
| 19 | 19 | $this->title=$title; |
| 20 | 20 | $this->content=$content; |
| 21 | - $this->setAttributes($variation,$params); |
|
| 21 | + $this->setAttributes($variation, $params); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | public function setHtml($html) { |
| 25 | - $this->html= $html; |
|
| 25 | + $this->html=$html; |
|
| 26 | 26 | return $this; |
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function setAttributes($variation=NULL,$params=array()){ |
|
| 29 | + public function setAttributes($variation=NULL, $params=array()) { |
|
| 30 | 30 | $this->variation=$variation; |
| 31 | 31 | $this->params=$params; |
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function onShow($jsCode){ |
|
| 34 | + public function onShow($jsCode) { |
|
| 35 | 35 | $this->params["onShow"]=$jsCode; |
| 36 | 36 | } |
| 37 | 37 | |
| 38 | - public function compile(JsUtils $js=NULL){ |
|
| 39 | - if(JString::isNotNull($this->title)){ |
|
| 38 | + public function compile(JsUtils $js=NULL) { |
|
| 39 | + if (JString::isNotNull($this->title)) { |
|
| 40 | 40 | $this->semElement->setProperty("data-title", $this->title); |
| 41 | 41 | } |
| 42 | - if(JString::isNotNull($this->content)){ |
|
| 42 | + if (JString::isNotNull($this->content)) { |
|
| 43 | 43 | $this->semElement->setProperty("data-content", $this->content); |
| 44 | 44 | } |
| 45 | 45 | $this->_compileHtml($js); |
| 46 | - if(JString::isNotNull($this->variation)){ |
|
| 46 | + if (JString::isNotNull($this->variation)) { |
|
| 47 | 47 | $this->semElement->setProperty("data-variation", $this->variation); |
| 48 | 48 | } |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - private function _compileHtml(JsUtils $js=NULL){ |
|
| 52 | - if(JString::isNotNull($this->html)){ |
|
| 51 | + private function _compileHtml(JsUtils $js=NULL) { |
|
| 52 | + if (JString::isNotNull($this->html)) { |
|
| 53 | 53 | $html=$this->html; |
| 54 | - if(\is_array($html)){ |
|
| 54 | + if (\is_array($html)) { |
|
| 55 | 55 | \array_walk($html, function(&$item) use($js){ |
| 56 | - if($item instanceof HtmlSemDoubleElement){ |
|
| 56 | + if ($item instanceof HtmlSemDoubleElement) { |
|
| 57 | 57 | $comp=$item->compile($js); |
| 58 | - if(isset($js)){ |
|
| 58 | + if (isset($js)) { |
|
| 59 | 59 | $bs=$item->run($js); |
| 60 | - if(isset($bs)) |
|
| 60 | + if (isset($bs)) |
|
| 61 | 61 | $this->params['onShow']=$bs->getScript(); |
| 62 | 62 | } |
| 63 | 63 | $item=$comp; |
| 64 | 64 | } |
| 65 | 65 | }); |
| 66 | - $html=\implode("",$html); |
|
| 66 | + $html=\implode("", $html); |
|
| 67 | 67 | } |
| 68 | 68 | $html=\str_replace("\"", "'", $html); |
| 69 | 69 | $this->semElement->addToProperty("data-html", $html); |
| 70 | 70 | } |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function run(JsUtils $js){ |
|
| 74 | - $js->semantic()->popup("#".$this->semElement->getIdentifier(),$this->params); |
|
| 73 | + public function run(JsUtils $js) { |
|
| 74 | + $js->semantic()->popup("#".$this->semElement->getIdentifier(), $this->params); |
|
| 75 | 75 | } |
| 76 | 76 | |
| 77 | 77 | } |