@@ -14,27 +14,27 @@ discard block |
||
| 14 | 14 | * @author jc |
| 15 | 15 | * |
| 16 | 16 | */ |
| 17 | -trait FormTrait{ |
|
| 17 | +trait FormTrait { |
|
| 18 | 18 | |
| 19 | 19 | /** |
| 20 | 20 | * @return HtmlForm |
| 21 | 21 | */ |
| 22 | 22 | abstract protected function getForm(); |
| 23 | 23 | |
| 24 | - protected function addCompoValidation(Form $compo,HtmlFormField $field){ |
|
| 24 | + protected function addCompoValidation(Form $compo, HtmlFormField $field) { |
|
| 25 | 25 | $validation=$field->getValidation(); |
| 26 | - if(isset($validation)){ |
|
| 26 | + if (isset($validation)) { |
|
| 27 | 27 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
| 28 | 28 | $compo->addFieldValidation($validation); |
| 29 | 29 | } |
| 30 | 30 | return $compo; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){ |
|
| 33 | + protected function _runValidationParams(Form&$compo, JsUtils $js=NULL) { |
|
| 34 | 34 | $form=$this->getForm(); |
| 35 | 35 | $params=$form->getValidationParams(); |
| 36 | - if(isset($params["_ajaxSubmit"])){ |
|
| 37 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
| 36 | + if (isset($params["_ajaxSubmit"])) { |
|
| 37 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
| 38 | 38 | $this->onSuccess($compilation); |
| 39 | 39 | $form->removeValidationParam("_ajaxSubmit"); |
| 40 | 40 | } |
@@ -43,16 +43,16 @@ discard block |
||
| 43 | 43 | $form->addEventsOnRun($js); |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
| 46 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
| 47 | 47 | $compilation=""; |
| 48 | - if(\is_array($ajaxSubmit)){ |
|
| 49 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
| 48 | + if (\is_array($ajaxSubmit)) { |
|
| 49 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
| 50 | 50 | $compilation.=$ajaxSubmitItem->compile($js); |
| 51 | 51 | } |
| 52 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
| 52 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
| 53 | 53 | $compilation=$ajaxSubmit->compile($js); |
| 54 | 54 | } |
| 55 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
| 55 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
| 56 | 56 | return $compilation; |
| 57 | 57 | } |
| 58 | 58 | |
@@ -65,14 +65,14 @@ discard block |
||
| 65 | 65 | return $this; |
| 66 | 66 | } |
| 67 | 67 | |
| 68 | - public function setAttached($value=true){ |
|
| 68 | + public function setAttached($value=true) { |
|
| 69 | 69 | $form=$this->getForm(); |
| 70 | - if($value) |
|
| 71 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 70 | + if ($value) |
|
| 71 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
| 72 | 72 | return $form; |
| 73 | 73 | } |
| 74 | 74 | |
| 75 | - public function addErrorMessage(){ |
|
| 75 | + public function addErrorMessage() { |
|
| 76 | 76 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
| 77 | 77 | } |
| 78 | 78 | |
@@ -88,47 +88,47 @@ discard block |
||
| 88 | 88 | * @param array $parameters |
| 89 | 89 | * @return HtmlForm |
| 90 | 90 | */ |
| 91 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
| 91 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
| 92 | 92 | $form=$this->getForm(); |
| 93 | - if($identifierOrElement instanceof BaseHtml) |
|
| 93 | + if ($identifierOrElement instanceof BaseHtml) |
|
| 94 | 94 | $elem=$identifierOrElement; |
| 95 | 95 | else |
| 96 | 96 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
| 97 | - if(isset($elem)){ |
|
| 98 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
| 97 | + if (isset($elem)) { |
|
| 98 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
| 99 | 99 | } |
| 100 | 100 | return $form; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
| 104 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
| 103 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
| 104 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
| 105 | 105 | } |
| 106 | 106 | |
| 107 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
| 108 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
| 109 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
| 107 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
| 108 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
| 109 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
| 112 | + protected function _buttonAsSubmit(BaseHtml&$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
| 113 | 113 | $form=$this->getForm(); |
| 114 | - if(isset($url) && isset($responseElement)){ |
|
| 115 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
| 116 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
| 114 | + if (isset($url) && isset($responseElement)) { |
|
| 115 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
| 116 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
| 117 | 117 | } |
| 118 | 118 | return $button; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
| 121 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
| 122 | 122 | $form=$this->getForm(); |
| 123 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
| 124 | - if(\is_array($parameters)) |
|
| 125 | - $params=\array_merge($params,$parameters); |
|
| 123 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
| 124 | + if (\is_array($parameters)) |
|
| 125 | + $params=\array_merge($params, $parameters); |
|
| 126 | 126 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
| 127 | 127 | return $this; |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
| 131 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
| 130 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
| 131 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
| 132 | 132 | $bt->setProperty("type", "reset"); |
| 133 | 133 | return $bt; |
| 134 | 134 | } |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | * @param string $jsCode |
| 139 | 139 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
| 140 | 140 | */ |
| 141 | - public function onValid($jsCode){ |
|
| 141 | + public function onValid($jsCode) { |
|
| 142 | 142 | $form=$this->getForm(); |
| 143 | 143 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
| 144 | 144 | return $form; |
@@ -149,9 +149,9 @@ discard block |
||
| 149 | 149 | * @param string $jsCode can use event and fields parameters |
| 150 | 150 | * @return HtmlForm |
| 151 | 151 | */ |
| 152 | - public function onSuccess($jsCode){ |
|
| 152 | + public function onSuccess($jsCode) { |
|
| 153 | 153 | $form=$this->getForm(); |
| 154 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
| 154 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
| 155 | 155 | return $form; |
| 156 | 156 | } |
| 157 | 157 | } |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | * @property HtmlSemDoubleElement $_self |
| 16 | 16 | */ |
| 17 | 17 | trait BaseTrait { |
| 18 | - protected $_variations=[ ]; |
|
| 19 | - protected $_states=[ ]; |
|
| 18 | + protected $_variations=[]; |
|
| 19 | + protected $_states=[]; |
|
| 20 | 20 | protected $_baseClass; |
| 21 | 21 | |
| 22 | 22 | abstract protected function setPropertyCtrl($name, $value, $typeCtrl); |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | abstract public function setProperty($name, $value); |
| 31 | 31 | |
| 32 | - abstract public function addContent($content,$before=false); |
|
| 32 | + abstract public function addContent($content, $before=false); |
|
| 33 | 33 | |
| 34 | 34 | abstract public function onCreate($jsCode); |
| 35 | 35 | |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
| 51 | 51 | if (\is_string($variations)) |
| 52 | 52 | $variations=\explode(" ", $variations); |
| 53 | - foreach ( $variations as $variation ) { |
|
| 53 | + foreach ($variations as $variation) { |
|
| 54 | 54 | $this->_self->addVariation($variation); |
| 55 | 55 | } |
| 56 | 56 | return $this; |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | public function addVariations($variations=array()) { |
| 65 | 65 | if (\is_string($variations)) |
| 66 | 66 | $variations=\explode(" ", $variations); |
| 67 | - foreach ( $variations as $variation ) { |
|
| 67 | + foreach ($variations as $variation) { |
|
| 68 | 68 | $this->_self->addVariation($variation); |
| 69 | 69 | } |
| 70 | 70 | return $this; |
@@ -73,7 +73,7 @@ discard block |
||
| 73 | 73 | public function addStates($states=array()) { |
| 74 | 74 | if (\is_string($states)) |
| 75 | 75 | $states=\explode(" ", $states); |
| 76 | - foreach ( $states as $state ) { |
|
| 76 | + foreach ($states as $state) { |
|
| 77 | 77 | $this->_self->addState($state); |
| 78 | 78 | } |
| 79 | 79 | return $this; |
@@ -83,17 +83,17 @@ discard block |
||
| 83 | 83 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
| 84 | 84 | if (\is_string($states)) |
| 85 | 85 | $states=\explode(" ", $states); |
| 86 | - foreach ( $states as $state ) { |
|
| 86 | + foreach ($states as $state) { |
|
| 87 | 87 | $this->_self->addState($state); |
| 88 | 88 | } |
| 89 | 89 | return $this; |
| 90 | 90 | } |
| 91 | 91 | |
| 92 | 92 | public function addIcon($icon, $before=true) { |
| 93 | - return $this->_self->addContent(new HtmlIcon("icon-" . $this->_self->getIdentifier(), $icon), $before); |
|
| 93 | + return $this->_self->addContent(new HtmlIcon("icon-".$this->_self->getIdentifier(), $icon), $before); |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | - public function addSticky($context="body"){ |
|
| 96 | + public function addSticky($context="body") { |
|
| 97 | 97 | $this->_self->onCreate("$('#".$this->_self->getIdentifier()."').sticky({ context: '".$context."'});"); |
| 98 | 98 | return $this; |
| 99 | 99 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | * @return HtmlSemDoubleElement |
| 115 | 115 | */ |
| 116 | 116 | public function setDisabled($disable=true) { |
| 117 | - if($disable) |
|
| 117 | + if ($disable) |
|
| 118 | 118 | $this->_self->addToProperty("class", "disabled"); |
| 119 | 119 | return $this; |
| 120 | 120 | } |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | * |
| 141 | 141 | * @return HtmlSemDoubleElement |
| 142 | 142 | */ |
| 143 | - public function asHeader(){ |
|
| 143 | + public function asHeader() { |
|
| 144 | 144 | return $this->_self->addToProperty("class", "header"); |
| 145 | 145 | } |
| 146 | 146 | |
@@ -148,15 +148,15 @@ discard block |
||
| 148 | 148 | * show it is currently the active user selection |
| 149 | 149 | * @return HtmlSemDoubleElement |
| 150 | 150 | */ |
| 151 | - public function setActive($value=true){ |
|
| 152 | - if($value) |
|
| 151 | + public function setActive($value=true) { |
|
| 152 | + if ($value) |
|
| 153 | 153 | $this->_self->addToProperty("class", "active"); |
| 154 | 154 | return $this; |
| 155 | 155 | } |
| 156 | 156 | |
| 157 | - public function setAttached($value=true){ |
|
| 158 | - if($value) |
|
| 159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 157 | + public function setAttached($value=true) { |
|
| 158 | + if ($value) |
|
| 159 | + $this->_self->addToPropertyCtrl("class", "attached", array("attached")); |
|
| 160 | 160 | return $this; |
| 161 | 161 | } |
| 162 | 162 | |
@@ -164,13 +164,13 @@ discard block |
||
| 164 | 164 | * can be formatted to appear on dark backgrounds |
| 165 | 165 | */ |
| 166 | 166 | public function setInverted($recursive=true) { |
| 167 | - if($recursive===true){ |
|
| 167 | + if ($recursive===true) { |
|
| 168 | 168 | $content=$this->_self->getContent(); |
| 169 | - if($content instanceof HtmlSemDoubleElement) |
|
| 169 | + if ($content instanceof HtmlSemDoubleElement) |
|
| 170 | 170 | $content->setInverted($recursive); |
| 171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
| 172 | - foreach ($content as $elm){ |
|
| 173 | - if($elm instanceof HtmlSemDoubleElement){ |
|
| 171 | + elseif (\is_array($content) || $content instanceof \Traversable) { |
|
| 172 | + foreach ($content as $elm) { |
|
| 173 | + if ($elm instanceof HtmlSemDoubleElement) { |
|
| 174 | 174 | $elm->setInverted($recursive); |
| 175 | 175 | } |
| 176 | 176 | } |
@@ -184,7 +184,7 @@ discard block |
||
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | public function setFloated($direction="right") { |
| 187 | - return $this->_self->addToPropertyCtrl("class", $direction . " floated", Direction::getConstantValues("floated")); |
|
| 187 | + return $this->_self->addToPropertyCtrl("class", $direction." floated", Direction::getConstantValues("floated")); |
|
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | public function floatRight() { |
@@ -199,14 +199,14 @@ discard block |
||
| 199 | 199 | return $this->_baseClass; |
| 200 | 200 | } |
| 201 | 201 | |
| 202 | - protected function addBehavior(&$array,$key,$value,$before="",$after=""){ |
|
| 203 | - if(\is_string($value)){ |
|
| 204 | - if(isset($array[$key])){ |
|
| 202 | + protected function addBehavior(&$array, $key, $value, $before="", $after="") { |
|
| 203 | + if (\is_string($value)) { |
|
| 204 | + if (isset($array[$key])) { |
|
| 205 | 205 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
| 206 | 206 | $array[$key]=$before.$p.$value.$after; |
| 207 | - }else |
|
| 207 | + } else |
|
| 208 | 208 | $array[$key]=$before.$value.$after; |
| 209 | - }else{ |
|
| 209 | + } else { |
|
| 210 | 210 | $array[$key]=$value; |
| 211 | 211 | } |
| 212 | 212 | return $this; |
@@ -48,8 +48,9 @@ discard block |
||
| 48 | 48 | |
| 49 | 49 | public function setVariations($variations) { |
| 50 | 50 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
| 51 | - if (\is_string($variations)) |
|
| 52 | - $variations=\explode(" ", $variations); |
|
| 51 | + if (\is_string($variations)) { |
|
| 52 | + $variations=\explode(" ", $variations); |
|
| 53 | + } |
|
| 53 | 54 | foreach ( $variations as $variation ) { |
| 54 | 55 | $this->_self->addVariation($variation); |
| 55 | 56 | } |
@@ -62,8 +63,9 @@ discard block |
||
| 62 | 63 | } |
| 63 | 64 | |
| 64 | 65 | public function addVariations($variations=array()) { |
| 65 | - if (\is_string($variations)) |
|
| 66 | - $variations=\explode(" ", $variations); |
|
| 66 | + if (\is_string($variations)) { |
|
| 67 | + $variations=\explode(" ", $variations); |
|
| 68 | + } |
|
| 67 | 69 | foreach ( $variations as $variation ) { |
| 68 | 70 | $this->_self->addVariation($variation); |
| 69 | 71 | } |
@@ -71,8 +73,9 @@ discard block |
||
| 71 | 73 | } |
| 72 | 74 | |
| 73 | 75 | public function addStates($states=array()) { |
| 74 | - if (\is_string($states)) |
|
| 75 | - $states=\explode(" ", $states); |
|
| 76 | + if (\is_string($states)) { |
|
| 77 | + $states=\explode(" ", $states); |
|
| 78 | + } |
|
| 76 | 79 | foreach ( $states as $state ) { |
| 77 | 80 | $this->_self->addState($state); |
| 78 | 81 | } |
@@ -81,8 +84,9 @@ discard block |
||
| 81 | 84 | |
| 82 | 85 | public function setStates($states) { |
| 83 | 86 | $this->_self->setProperty("class", $this->_self->getBaseClass()); |
| 84 | - if (\is_string($states)) |
|
| 85 | - $states=\explode(" ", $states); |
|
| 87 | + if (\is_string($states)) { |
|
| 88 | + $states=\explode(" ", $states); |
|
| 89 | + } |
|
| 86 | 90 | foreach ( $states as $state ) { |
| 87 | 91 | $this->_self->addState($state); |
| 88 | 92 | } |
@@ -114,8 +118,9 @@ discard block |
||
| 114 | 118 | * @return HtmlSemDoubleElement |
| 115 | 119 | */ |
| 116 | 120 | public function setDisabled($disable=true) { |
| 117 | - if($disable) |
|
| 118 | - $this->_self->addToProperty("class", "disabled"); |
|
| 121 | + if($disable) { |
|
| 122 | + $this->_self->addToProperty("class", "disabled"); |
|
| 123 | + } |
|
| 119 | 124 | return $this; |
| 120 | 125 | } |
| 121 | 126 | |
@@ -149,14 +154,16 @@ discard block |
||
| 149 | 154 | * @return HtmlSemDoubleElement |
| 150 | 155 | */ |
| 151 | 156 | public function setActive($value=true){ |
| 152 | - if($value) |
|
| 153 | - $this->_self->addToProperty("class", "active"); |
|
| 157 | + if($value) { |
|
| 158 | + $this->_self->addToProperty("class", "active"); |
|
| 159 | + } |
|
| 154 | 160 | return $this; |
| 155 | 161 | } |
| 156 | 162 | |
| 157 | 163 | public function setAttached($value=true){ |
| 158 | - if($value) |
|
| 159 | - $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 164 | + if($value) { |
|
| 165 | + $this->_self->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
| 166 | + } |
|
| 160 | 167 | return $this; |
| 161 | 168 | } |
| 162 | 169 | |
@@ -166,9 +173,9 @@ discard block |
||
| 166 | 173 | public function setInverted($recursive=true) { |
| 167 | 174 | if($recursive===true){ |
| 168 | 175 | $content=$this->_self->getContent(); |
| 169 | - if($content instanceof HtmlSemDoubleElement) |
|
| 170 | - $content->setInverted($recursive); |
|
| 171 | - elseif(\is_array($content) || $content instanceof \Traversable){ |
|
| 176 | + if($content instanceof HtmlSemDoubleElement) { |
|
| 177 | + $content->setInverted($recursive); |
|
| 178 | + } elseif(\is_array($content) || $content instanceof \Traversable){ |
|
| 172 | 179 | foreach ($content as $elm){ |
| 173 | 180 | if($elm instanceof HtmlSemDoubleElement){ |
| 174 | 181 | $elm->setInverted($recursive); |
@@ -204,9 +211,10 @@ discard block |
||
| 204 | 211 | if(isset($array[$key])){ |
| 205 | 212 | $p=JString::replaceAtFirstAndLast($array[$key], $before, "", $after, ""); |
| 206 | 213 | $array[$key]=$before.$p.$value.$after; |
| 207 | - }else |
|
| 208 | - $array[$key]=$before.$value.$after; |
|
| 209 | - }else{ |
|
| 214 | + } else { |
|
| 215 | + $array[$key]=$before.$value.$after; |
|
| 216 | + } |
|
| 217 | + } else{ |
|
| 210 | 218 | $array[$key]=$value; |
| 211 | 219 | } |
| 212 | 220 | return $this; |
@@ -2,9 +2,9 @@ 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 (); |
|
| 7 | + protected $jquery_code_for_compile=array(); |
|
| 8 | 8 | |
| 9 | 9 | protected function _addToCompile($jsScript) { |
| 10 | 10 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -14,9 +14,9 @@ discard block |
||
| 14 | 14 | * @param BaseGui $library |
| 15 | 15 | * @param mixed $view |
| 16 | 16 | */ |
| 17 | - protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
|
| 17 | + protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL) { |
|
| 18 | 18 | if ($library!=NULL) { |
| 19 | - if(isset($view)) |
|
| 19 | + if (isset($view)) |
|
| 20 | 20 | $library->compileHtml($this, $view); |
| 21 | 21 | if ($library->isAutoCompile()) { |
| 22 | 22 | $library->compile(true); |
@@ -24,20 +24,20 @@ discard block |
||
| 24 | 24 | } |
| 25 | 25 | } |
| 26 | 26 | |
| 27 | - protected function defer($script){ |
|
| 27 | + protected function defer($script) { |
|
| 28 | 28 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
| 29 | 29 | $result.="window.defer(function(){".$script."})"; |
| 30 | 30 | return $result; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - protected function ready($script){ |
|
| 33 | + protected function ready($script) { |
|
| 34 | 34 | $result='$(document).ready(function() {'."\n"; |
| 35 | 35 | $result.=$script.'})'; |
| 36 | 36 | return $result; |
| 37 | 37 | } |
| 38 | 38 | |
| 39 | 39 | protected function minify($input) { |
| 40 | - if(trim($input) === "") return $input; |
|
| 40 | + if (trim($input)==="") return $input; |
|
| 41 | 41 | return preg_replace( |
| 42 | 42 | array( |
| 43 | 43 | // Remove comment(s) |
@@ -16,8 +16,9 @@ discard block |
||
| 16 | 16 | */ |
| 17 | 17 | protected function _compileLibrary(BaseGui $library=NULL, &$view=NULL){ |
| 18 | 18 | if ($library!=NULL) { |
| 19 | - if(isset($view)) |
|
| 20 | - $library->compileHtml($this, $view); |
|
| 19 | + if(isset($view)) { |
|
| 20 | + $library->compileHtml($this, $view); |
|
| 21 | + } |
|
| 21 | 22 | if ($library->isAutoCompile()) { |
| 22 | 23 | $library->compile(true); |
| 23 | 24 | } |
@@ -37,7 +38,9 @@ discard block |
||
| 37 | 38 | } |
| 38 | 39 | |
| 39 | 40 | protected function minify($input) { |
| 40 | - if(trim($input) === "") return $input; |
|
| 41 | + if(trim($input) === "") { |
|
| 42 | + return $input; |
|
| 43 | + } |
|
| 41 | 44 | return preg_replace( |
| 42 | 45 | array( |
| 43 | 46 | // Remove comment(s) |
@@ -9,12 +9,12 @@ discard block |
||
| 9 | 9 | * @author jc |
| 10 | 10 | * @property BaseWidget $_self |
| 11 | 11 | */ |
| 12 | -trait BaseHtmlPropertiesTrait{ |
|
| 12 | +trait BaseHtmlPropertiesTrait { |
|
| 13 | 13 | |
| 14 | - protected $properties=array (); |
|
| 14 | + protected $properties=array(); |
|
| 15 | 15 | abstract protected function ctrl($name, $value, $typeCtrl); |
| 16 | 16 | abstract protected function removeOldValues(&$oldValue, $allValues); |
| 17 | - abstract protected function _getElementBy($callback,$elements); |
|
| 17 | + abstract protected function _getElementBy($callback, $elements); |
|
| 18 | 18 | public function getProperties() { |
| 19 | 19 | return $this->_self->properties; |
| 20 | 20 | } |
@@ -40,13 +40,13 @@ discard block |
||
| 40 | 40 | |
| 41 | 41 | public function addToProperty($name, $value, $separator=" ") { |
| 42 | 42 | if (\is_array($value)) { |
| 43 | - foreach ( $value as $v ) { |
|
| 43 | + foreach ($value as $v) { |
|
| 44 | 44 | $this->_self->addToProperty($name, $v, $separator); |
| 45 | 45 | } |
| 46 | - } else if ($value !== "" && $this->_self->propertyContains($name, $value) === false) { |
|
| 46 | + } else if ($value!=="" && $this->_self->propertyContains($name, $value)===false) { |
|
| 47 | 47 | $v=@$this->_self->properties[$name]; |
| 48 | - if (isset($v) && $v !== "") |
|
| 49 | - $v=$v . $separator . $value; |
|
| 48 | + if (isset($v) && $v!=="") |
|
| 49 | + $v=$v.$separator.$value; |
|
| 50 | 50 | else |
| 51 | 51 | $v=$value; |
| 52 | 52 | |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | } |
| 85 | 85 | |
| 86 | 86 | public function addToPropertyCtrlCheck($name, $value, $typeCtrl) { |
| 87 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) { |
|
| 87 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) { |
|
| 88 | 88 | return $this->_self->addToProperty($name, $value); |
| 89 | 89 | } |
| 90 | 90 | return $this; |
@@ -105,12 +105,12 @@ discard block |
||
| 105 | 105 | } |
| 106 | 106 | |
| 107 | 107 | protected function setPropertyCtrl($name, $value, $typeCtrl) { |
| 108 | - if ($this->_self->ctrl($name, $value, $typeCtrl) === true) |
|
| 108 | + if ($this->_self->ctrl($name, $value, $typeCtrl)===true) |
|
| 109 | 109 | return $this->_self->setProperty($name, $value); |
| 110 | 110 | return $this; |
| 111 | 111 | } |
| 112 | 112 | |
| 113 | - protected function getElementByPropertyValue($propertyName,$value, $elements) { |
|
| 114 | - return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName,$value){return $element->propertyContains($propertyName, $value) === true;}, $elements); |
|
| 113 | + protected function getElementByPropertyValue($propertyName, $value, $elements) { |
|
| 114 | + return $this->_self->_getElementBy(function(BaseHtml $element) use ($propertyName, $value){return $element->propertyContains($propertyName, $value)===true; }, $elements); |
|
| 115 | 115 | } |
| 116 | 116 | } |