phpMv /
phpMv-UI
@@ -18,11 +18,11 @@ discard block |
||
| 18 | 18 | protected $_dropdown; |
| 19 | 19 | public function __construct($identifier, $elements=array(), $asIcons=false) { |
| 20 | 20 | parent::__construct($identifier, "div", "ui buttons"); |
| 21 | - if ($asIcons === true) |
|
| 21 | + if ($asIcons===true) |
|
| 22 | 22 | $this->asIcons(); |
| 23 | 23 | $this->addElements($elements, $asIcons); |
| 24 | 24 | } |
| 25 | - protected function createItem($value){ |
|
| 25 | + protected function createItem($value) { |
|
| 26 | 26 | return new HtmlButton("", $value); |
| 27 | 27 | } |
| 28 | 28 | |
@@ -31,10 +31,10 @@ discard block |
||
| 31 | 31 | * @param boolean $asCombo |
| 32 | 32 | * @return HtmlDropdown |
| 33 | 33 | */ |
| 34 | - public function addDropdown($items,$asCombo=false){ |
|
| 35 | - $dd= new HtmlDropdown("dd-".$this->identifier,null,$items); |
|
| 34 | + public function addDropdown($items, $asCombo=false) { |
|
| 35 | + $dd=new HtmlDropdown("dd-".$this->identifier, null, $items); |
|
| 36 | 36 | $dd->asButton(); |
| 37 | - if($asCombo){ |
|
| 37 | + if ($asCombo) { |
|
| 38 | 38 | $dd->setAction("combo"); |
| 39 | 39 | $dd->addToProperty("class", "combo"); |
| 40 | 40 | } |
@@ -45,13 +45,13 @@ discard block |
||
| 45 | 45 | |
| 46 | 46 | public function addElement($element, $asIcon=false) { |
| 47 | 47 | $item=$this->addItem($element); |
| 48 | - if($asIcon) |
|
| 48 | + if ($asIcon) |
|
| 49 | 49 | $item->asIcon($element); |
| 50 | 50 | return $item; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | public function addElements($elements, $asIcons=false) { |
| 54 | - foreach ( $elements as $element ) { |
|
| 54 | + foreach ($elements as $element) { |
|
| 55 | 55 | $this->addElement($element, $asIcons); |
| 56 | 56 | } |
| 57 | 57 | return $this; |
@@ -60,7 +60,7 @@ discard block |
||
| 60 | 60 | public function insertOr($aferIndex=0, $or="or") { |
| 61 | 61 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
| 62 | 62 | $orElement->setProperty("data-text", $or); |
| 63 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
| 63 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
| 64 | 64 | return $this; |
| 65 | 65 | } |
| 66 | 66 | |
@@ -73,8 +73,8 @@ discard block |
||
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | public function asIcons() { |
| 76 | - foreach ( $this->content as $item ) { |
|
| 77 | - if($item instanceof HtmlButton) |
|
| 76 | + foreach ($this->content as $item) { |
|
| 77 | + if ($item instanceof HtmlButton) |
|
| 78 | 78 | $item->asIcon($item->getContent()); |
| 79 | 79 | } |
| 80 | 80 | return $this->addToProperty("class", "icons"); |
@@ -107,7 +107,7 @@ discard block |
||
| 107 | 107 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
| 108 | 108 | */ |
| 109 | 109 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
| 110 | - foreach ( $this->content as $element ) { |
|
| 110 | + foreach ($this->content as $element) { |
|
| 111 | 111 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
| 112 | 112 | } |
| 113 | 113 | return $this; |
@@ -119,10 +119,10 @@ discard block |
||
| 119 | 119 | |
| 120 | 120 | public function addClasses($classes=array()) { |
| 121 | 121 | $i=0; |
| 122 | - if(!\is_array($classes)){ |
|
| 123 | - $classes=array_fill (0,$this->count(),$classes); |
|
| 122 | + if (!\is_array($classes)) { |
|
| 123 | + $classes=array_fill(0, $this->count(), $classes); |
|
| 124 | 124 | } |
| 125 | - foreach ( $this->content as $button ) { |
|
| 125 | + foreach ($this->content as $button) { |
|
| 126 | 126 | $button->addToProperty("class", $classes[$i++]); |
| 127 | 127 | } |
| 128 | 128 | return $this; |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | $this->addElement($function($object)); |
| 137 | 137 | } |
| 138 | 138 | |
| 139 | - public function run(JsUtils $js){ |
|
| 140 | - $result= parent::run($js); |
|
| 139 | + public function run(JsUtils $js) { |
|
| 140 | + $result=parent::run($js); |
|
| 141 | 141 | return $result->setItemSelector(".ui.button"); |
| 142 | 142 | } |
| 143 | 143 | |
@@ -50,6 +50,10 @@ discard block |
||
| 50 | 50 | return $itemO; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | + /** |
|
| 54 | + * @param string $classname |
|
| 55 | + * @param integer $index |
|
| 56 | + */ |
|
| 53 | 57 | protected function setItemIdentifier($item,$classname,$index){ |
| 54 | 58 | if($item instanceof BaseWidget){ |
| 55 | 59 | if(JString::isNull($item->getIdentifier())){ |
@@ -94,6 +98,9 @@ discard block |
||
| 94 | 98 | return $this; |
| 95 | 99 | } |
| 96 | 100 | |
| 101 | + /** |
|
| 102 | + * @param integer $index |
|
| 103 | + */ |
|
| 97 | 104 | public function removeItem($index){ |
| 98 | 105 | return array_splice($this->content, $index, 1); |
| 99 | 106 | } |
@@ -109,6 +116,9 @@ discard block |
||
| 109 | 116 | return $this->addItem($function($object)); |
| 110 | 117 | } |
| 111 | 118 | |
| 119 | + /** |
|
| 120 | + * @param \Closure $callBack |
|
| 121 | + */ |
|
| 112 | 122 | public function apply($callBack){ |
| 113 | 123 | foreach ($this->content as $item){ |
| 114 | 124 | $callBack($item); |
@@ -15,44 +15,44 @@ discard block |
||
| 15 | 15 | */ |
| 16 | 16 | abstract class HtmlCollection extends HtmlDoubleElement { |
| 17 | 17 | |
| 18 | - public function __construct($identifier,$tagName="div"){ |
|
| 19 | - parent::__construct($identifier,$tagName); |
|
| 18 | + public function __construct($identifier, $tagName="div") { |
|
| 19 | + parent::__construct($identifier, $tagName); |
|
| 20 | 20 | $this->content=array(); |
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function addItems($items){ |
|
| 24 | - if(JArray::isAssociative($items)){ |
|
| 25 | - foreach ($items as $k=>$v){ |
|
| 26 | - $this->addItem([$k,$v]); |
|
| 23 | + public function addItems($items) { |
|
| 24 | + if (JArray::isAssociative($items)) { |
|
| 25 | + foreach ($items as $k=>$v) { |
|
| 26 | + $this->addItem([$k, $v]); |
|
| 27 | 27 | } |
| 28 | - }else{ |
|
| 29 | - foreach ($items as $item){ |
|
| 28 | + } else { |
|
| 29 | + foreach ($items as $item) { |
|
| 30 | 30 | $this->addItem($item); |
| 31 | 31 | } |
| 32 | 32 | } |
| 33 | 33 | return $this; |
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function setItems($items){ |
|
| 36 | + public function setItems($items) { |
|
| 37 | 37 | $this->content=$items; |
| 38 | 38 | return $this; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - public function getItems(){ |
|
| 41 | + public function getItems() { |
|
| 42 | 42 | return $this->content; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | - protected function getItemToAdd($item){ |
|
| 45 | + protected function getItemToAdd($item) { |
|
| 46 | 46 | $itemO=$item; |
| 47 | - if($this->createCondition($item)===true){ |
|
| 47 | + if ($this->createCondition($item)===true) { |
|
| 48 | 48 | $itemO=$this->createItem($item); |
| 49 | 49 | } |
| 50 | 50 | return $itemO; |
| 51 | 51 | } |
| 52 | 52 | |
| 53 | - protected function setItemIdentifier($item,$classname,$index){ |
|
| 54 | - if($item instanceof BaseWidget){ |
|
| 55 | - if(JString::isNull($item->getIdentifier())){ |
|
| 53 | + protected function setItemIdentifier($item, $classname, $index) { |
|
| 54 | + if ($item instanceof BaseWidget) { |
|
| 55 | + if (JString::isNull($item->getIdentifier())) { |
|
| 56 | 56 | $item->setIdentifier($classname."-".$this->identifier."-".$index); |
| 57 | 57 | } |
| 58 | 58 | } |
@@ -63,15 +63,15 @@ discard block |
||
| 63 | 63 | * @param HtmlDoubleElement|string|array $item |
| 64 | 64 | * @return \Ajax\common\html\HtmlDoubleElement |
| 65 | 65 | */ |
| 66 | - public function addItem($item){ |
|
| 66 | + public function addItem($item) { |
|
| 67 | 67 | $itemO=$this->getItemToAdd($item); |
| 68 | 68 | $this->addContent($itemO); |
| 69 | 69 | return $itemO; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - public function insertItem($item,$position=0){ |
|
| 72 | + public function insertItem($item, $position=0) { |
|
| 73 | 73 | $itemO=$this->getItemToAdd($item); |
| 74 | - \array_splice( $this->content, $position, 0, array($itemO)); |
|
| 74 | + \array_splice($this->content, $position, 0, array($itemO)); |
|
| 75 | 75 | return $itemO; |
| 76 | 76 | } |
| 77 | 77 | |
@@ -94,11 +94,11 @@ discard block |
||
| 94 | 94 | return $this; |
| 95 | 95 | } |
| 96 | 96 | |
| 97 | - public function removeItem($index){ |
|
| 97 | + public function removeItem($index) { |
|
| 98 | 98 | return array_splice($this->content, $index, 1); |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | - public function count(){ |
|
| 101 | + public function count() { |
|
| 102 | 102 | return \sizeof($this->content); |
| 103 | 103 | } |
| 104 | 104 | |
@@ -109,8 +109,8 @@ discard block |
||
| 109 | 109 | return $this->addItem($function($object)); |
| 110 | 110 | } |
| 111 | 111 | |
| 112 | - public function apply($callBack){ |
|
| 113 | - foreach ($this->content as $item){ |
|
| 112 | + public function apply($callBack) { |
|
| 113 | + foreach ($this->content as $item) { |
|
| 114 | 114 | $callBack($item); |
| 115 | 115 | } |
| 116 | 116 | return $this; |
@@ -130,23 +130,23 @@ discard block |
||
| 130 | 130 | */ |
| 131 | 131 | abstract protected function createItem($value); |
| 132 | 132 | |
| 133 | - protected function createCondition($value){ |
|
| 133 | + protected function createCondition($value) { |
|
| 134 | 134 | return \is_object($value)===false; |
| 135 | 135 | } |
| 136 | 136 | |
| 137 | - protected function contentAs($tagName){ |
|
| 138 | - foreach ($this->content as $item){ |
|
| 137 | + protected function contentAs($tagName) { |
|
| 138 | + foreach ($this->content as $item) { |
|
| 139 | 139 | $item->setTagName($tagName); |
| 140 | 140 | } |
| 141 | 141 | return $this; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public function setProperties($properties){ |
|
| 144 | + public function setProperties($properties) { |
|
| 145 | 145 | $i=0; |
| 146 | - foreach ($properties as $k=>$v){ |
|
| 146 | + foreach ($properties as $k=>$v) { |
|
| 147 | 147 | $c=$this->content[$i++]; |
| 148 | - if(isset($c)) |
|
| 149 | - $c->setProperty($k,$v); |
|
| 148 | + if (isset($c)) |
|
| 149 | + $c->setProperty($k, $v); |
|
| 150 | 150 | else |
| 151 | 151 | return $this; |
| 152 | 152 | } |
@@ -159,17 +159,17 @@ discard block |
||
| 159 | 159 | * @param array $values |
| 160 | 160 | * @return HtmlCollection |
| 161 | 161 | */ |
| 162 | - public function setPropertyValues($property,$values){ |
|
| 162 | + public function setPropertyValues($property, $values) { |
|
| 163 | 163 | $i=0; |
| 164 | - if(\is_array($values)===false){ |
|
| 165 | - $values=\array_fill(0, $this->count(),$values); |
|
| 164 | + if (\is_array($values)===false) { |
|
| 165 | + $values=\array_fill(0, $this->count(), $values); |
|
| 166 | 166 | } |
| 167 | - foreach ($values as $value){ |
|
| 167 | + foreach ($values as $value) { |
|
| 168 | 168 | $c=$this->content[$i++]; |
| 169 | - if(isset($c)){ |
|
| 170 | - $c->setProperty($property,$value); |
|
| 169 | + if (isset($c)) { |
|
| 170 | + $c->setProperty($property, $value); |
|
| 171 | 171 | } |
| 172 | - else{ |
|
| 172 | + else { |
|
| 173 | 173 | return $this; |
| 174 | 174 | } |
| 175 | 175 | } |
@@ -179,13 +179,13 @@ discard block |
||
| 179 | 179 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 180 | 180 | $index=0; |
| 181 | 181 | $classname=\strtolower(JReflection::shortClassName($this)); |
| 182 | - foreach ($this->content as $item){ |
|
| 183 | - $this->setItemIdentifier($item,$classname,$index++); |
|
| 182 | + foreach ($this->content as $item) { |
|
| 183 | + $this->setItemIdentifier($item, $classname, $index++); |
|
| 184 | 184 | } |
| 185 | - return parent::compile($js,$view); |
|
| 185 | + return parent::compile($js, $view); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - public function getItemById($identifier){ |
|
| 188 | + public function getItemById($identifier) { |
|
| 189 | 189 | return $this->getElementById($identifier, $this->content); |
| 190 | 190 | } |
| 191 | 191 | } |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | class HtmlForm extends HtmlSemCollection { |
| 22 | 22 | |
| 23 | - use FieldsTrait,FormTrait; |
|
| 23 | + use FieldsTrait, FormTrait; |
|
| 24 | 24 | /** |
| 25 | 25 | * @var array |
| 26 | 26 | */ |
@@ -33,14 +33,14 @@ discard block |
||
| 33 | 33 | |
| 34 | 34 | public function __construct($identifier, $elements=array()) { |
| 35 | 35 | parent::__construct($identifier, "form", "ui form"); |
| 36 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
| 36 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
| 37 | 37 | $this->setProperty("name", $this->identifier); |
| 38 | - $this->_fields=array (); |
|
| 38 | + $this->_fields=array(); |
|
| 39 | 39 | $this->addItems($elements); |
| 40 | 40 | $this->_validationParams=[]; |
| 41 | 41 | } |
| 42 | 42 | |
| 43 | - protected function getForm(){ |
|
| 43 | + protected function getForm() { |
|
| 44 | 44 | return $this; |
| 45 | 45 | } |
| 46 | 46 | |
@@ -62,8 +62,8 @@ discard block |
||
| 62 | 62 | * @param string $caption |
| 63 | 63 | * @return HtmlForm |
| 64 | 64 | */ |
| 65 | - public function addDivider($caption=NULL){ |
|
| 66 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
| 65 | + public function addDivider($caption=NULL) { |
|
| 66 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | /** |
@@ -85,13 +85,13 @@ discard block |
||
| 85 | 85 | $label=NULL; |
| 86 | 86 | } |
| 87 | 87 | $this->_fields=\array_merge($this->_fields, $fields); |
| 88 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
| 88 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
| 89 | 89 | } |
| 90 | - if (isset($label)){ |
|
| 91 | - $fields->wrap("<div class='field'><label>{$label}</label>","</div>"); |
|
| 90 | + if (isset($label)) { |
|
| 91 | + $fields->wrap("<div class='field'><label>{$label}</label>", "</div>"); |
|
| 92 | 92 | } |
| 93 | 93 | } else { |
| 94 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
| 94 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
| 95 | 95 | } |
| 96 | 96 | $this->addItem($fields); |
| 97 | 97 | return $fields; |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | |
| 100 | 100 | public function addItem($item) { |
| 101 | 101 | $item=parent::addItem($item); |
| 102 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
| 102 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
| 103 | 103 | $this->_fields[]=$item; |
| 104 | 104 | } |
| 105 | 105 | return $item; |
@@ -157,39 +157,39 @@ discard block |
||
| 157 | 157 | |
| 158 | 158 | |
| 159 | 159 | |
| 160 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 161 | - if(\sizeof($this->_validationParams)>0) |
|
| 160 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 161 | + if (\sizeof($this->_validationParams)>0) |
|
| 162 | 162 | $this->setProperty("novalidate", ""); |
| 163 | - return parent::compile($js,$view); |
|
| 163 | + return parent::compile($js, $view); |
|
| 164 | 164 | } |
| 165 | 165 | |
| 166 | 166 | public function run(JsUtils $js) { |
| 167 | - if(isset($js)){ |
|
| 167 | + if (isset($js)) { |
|
| 168 | 168 | $compo=$js->semantic()->form("#".$this->identifier); |
| 169 | - }else{ |
|
| 169 | + } else { |
|
| 170 | 170 | $compo=new Form(); |
| 171 | 171 | $compo->attach("#".$this->identifier); |
| 172 | 172 | } |
| 173 | - foreach ($this->_fields as $field){ |
|
| 174 | - if($field instanceof HtmlFormField){ |
|
| 173 | + foreach ($this->_fields as $field) { |
|
| 174 | + if ($field instanceof HtmlFormField) { |
|
| 175 | 175 | $compo=$this->addCompoValidation($compo, $field); |
| 176 | 176 | } |
| 177 | 177 | } |
| 178 | - foreach ($this->content as $field){ |
|
| 179 | - if($field instanceof HtmlFormFields){ |
|
| 178 | + foreach ($this->content as $field) { |
|
| 179 | + if ($field instanceof HtmlFormFields) { |
|
| 180 | 180 | $items=$field->getItems(); |
| 181 | - foreach ($items as $_field){ |
|
| 182 | - if($_field instanceof HtmlFormField) |
|
| 181 | + foreach ($items as $_field) { |
|
| 182 | + if ($_field instanceof HtmlFormField) |
|
| 183 | 183 | $compo=$this->addCompoValidation($compo, $_field); |
| 184 | 184 | } |
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | - $this->_runValidationParams($compo,$js); |
|
| 187 | + $this->_runValidationParams($compo, $js); |
|
| 188 | 188 | return $this->_bsComponent; |
| 189 | 189 | } |
| 190 | 190 | |
| 191 | - public function addValidationParam($paramName,$paramValue,$before="",$after=""){ |
|
| 192 | - $this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after); |
|
| 191 | + public function addValidationParam($paramName, $paramValue, $before="", $after="") { |
|
| 192 | + $this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after); |
|
| 193 | 193 | return $this; |
| 194 | 194 | } |
| 195 | 195 | |
@@ -202,7 +202,7 @@ discard block |
||
| 202 | 202 | return $this->_validationParams; |
| 203 | 203 | } |
| 204 | 204 | |
| 205 | - public function removeValidationParam($param){ |
|
| 205 | + public function removeValidationParam($param) { |
|
| 206 | 206 | unset($this->_validationParams[$param]); |
| 207 | 207 | return $this; |
| 208 | 208 | } |
@@ -52,8 +52,9 @@ discard block |
||
| 52 | 52 | */ |
| 53 | 53 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 54 | 54 | $header=new HtmlHeader("", $niveau, $title); |
| 55 | - if ($dividing) |
|
| 56 | - $header->setDividing(); |
|
| 55 | + if ($dividing) { |
|
| 56 | + $header->setDividing(); |
|
| 57 | + } |
|
| 57 | 58 | return $this->addItem($header); |
| 58 | 59 | } |
| 59 | 60 | |
@@ -81,8 +82,9 @@ discard block |
||
| 81 | 82 | if (\is_string($end)) { |
| 82 | 83 | $label=$end; |
| 83 | 84 | \array_pop($fields); |
| 84 | - } else |
|
| 85 | - $label=NULL; |
|
| 85 | + } else { |
|
| 86 | + $label=NULL; |
|
| 87 | + } |
|
| 86 | 88 | } |
| 87 | 89 | $this->_fields=\array_merge($this->_fields, $fields); |
| 88 | 90 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -146,27 +148,31 @@ discard block |
||
| 146 | 148 | */ |
| 147 | 149 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 148 | 150 | $message=new HtmlMessage($identifier, $content); |
| 149 | - if (isset($header)) |
|
| 150 | - $message->addHeader($header); |
|
| 151 | - if (isset($icon)) |
|
| 152 | - $message->setIcon($icon); |
|
| 153 | - if (isset($type)) |
|
| 154 | - $message->setStyle($type); |
|
| 151 | + if (isset($header)) { |
|
| 152 | + $message->addHeader($header); |
|
| 153 | + } |
|
| 154 | + if (isset($icon)) { |
|
| 155 | + $message->setIcon($icon); |
|
| 156 | + } |
|
| 157 | + if (isset($type)) { |
|
| 158 | + $message->setStyle($type); |
|
| 159 | + } |
|
| 155 | 160 | return $this->addItem($message); |
| 156 | 161 | } |
| 157 | 162 | |
| 158 | 163 | |
| 159 | 164 | |
| 160 | 165 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 161 | - if(\sizeof($this->_validationParams)>0) |
|
| 162 | - $this->setProperty("novalidate", ""); |
|
| 166 | + if(\sizeof($this->_validationParams)>0) { |
|
| 167 | + $this->setProperty("novalidate", ""); |
|
| 168 | + } |
|
| 163 | 169 | return parent::compile($js,$view); |
| 164 | 170 | } |
| 165 | 171 | |
| 166 | 172 | public function run(JsUtils $js) { |
| 167 | 173 | if(isset($js)){ |
| 168 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
| 169 | - }else{ |
|
| 175 | + } else{ |
|
| 170 | 176 | $compo=new Form(); |
| 171 | 177 | $compo->attach("#".$this->identifier); |
| 172 | 178 | } |
@@ -179,8 +185,9 @@ discard block |
||
| 179 | 185 | if($field instanceof HtmlFormFields){ |
| 180 | 186 | $items=$field->getItems(); |
| 181 | 187 | foreach ($items as $_field){ |
| 182 | - if($_field instanceof HtmlFormField) |
|
| 183 | - $compo=$this->addCompoValidation($compo, $_field); |
|
| 188 | + if($_field instanceof HtmlFormField) { |
|
| 189 | + $compo=$this->addCompoValidation($compo, $_field); |
|
| 190 | + } |
|
| 184 | 191 | } |
| 185 | 192 | } |
| 186 | 193 | } |
@@ -13,29 +13,29 @@ discard block |
||
| 13 | 13 | use Ajax\semantic\html\collections\form\traits\FieldTrait; |
| 14 | 14 | |
| 15 | 15 | class HtmlDropdown extends HtmlSemDoubleElement { |
| 16 | - use FieldTrait,LabeledIconTrait { |
|
| 16 | + use FieldTrait, LabeledIconTrait { |
|
| 17 | 17 | addIcon as addIconP; |
| 18 | 18 | } |
| 19 | 19 | protected $mClass="menu"; |
| 20 | 20 | protected $mTagName="div"; |
| 21 | - protected $items=array (); |
|
| 22 | - protected $_params=array("action"=>"nothing","on"=>"hover","showOnFocus"=>false); |
|
| 21 | + protected $items=array(); |
|
| 22 | + protected $_params=array("action"=>"nothing", "on"=>"hover", "showOnFocus"=>false); |
|
| 23 | 23 | protected $input; |
| 24 | 24 | protected $value; |
| 25 | 25 | protected $_associative; |
| 26 | 26 | protected $_multiple; |
| 27 | 27 | |
| 28 | - public function __construct($identifier, $value="", $items=array(),$associative=true) { |
|
| 28 | + public function __construct($identifier, $value="", $items=array(), $associative=true) { |
|
| 29 | 29 | parent::__construct($identifier, "div"); |
| 30 | 30 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdown.php'; |
| 31 | 31 | $this->setProperty("class", "ui dropdown"); |
| 32 | 32 | $this->_multiple=false; |
| 33 | 33 | $content=[]; |
| 34 | - if(isset($value)){ |
|
| 35 | - if($value instanceof HtmlSemDoubleElement){ |
|
| 34 | + if (isset($value)) { |
|
| 35 | + if ($value instanceof HtmlSemDoubleElement) { |
|
| 36 | 36 | $text=$value; |
| 37 | - }else{ |
|
| 38 | - $text=new HtmlSemDoubleElement("text-".$this->identifier,"div"); |
|
| 37 | + } else { |
|
| 38 | + $text=new HtmlSemDoubleElement("text-".$this->identifier, "div"); |
|
| 39 | 39 | $text->setClass("text"); |
| 40 | 40 | $this->setValue($value); |
| 41 | 41 | } |
@@ -48,29 +48,29 @@ discard block |
||
| 48 | 48 | $this->addItems($items); |
| 49 | 49 | } |
| 50 | 50 | |
| 51 | - public function getField(){ |
|
| 51 | + public function getField() { |
|
| 52 | 52 | return $this->input; |
| 53 | 53 | } |
| 54 | 54 | |
| 55 | - public function getDataField(){ |
|
| 55 | + public function getDataField() { |
|
| 56 | 56 | return $this->input; |
| 57 | 57 | } |
| 58 | 58 | |
| 59 | - public function addItem($item,$value=NULL,$image=NULL,$description=NULL){ |
|
| 60 | - $itemO=$this->beforeAddItem($item,$value,$image,$description); |
|
| 59 | + public function addItem($item, $value=NULL, $image=NULL, $description=NULL) { |
|
| 60 | + $itemO=$this->beforeAddItem($item, $value, $image, $description); |
|
| 61 | 61 | $this->items[]=$itemO; |
| 62 | 62 | return $itemO; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function addIcon($icon,$before=true,$labeled=false){ |
|
| 65 | + public function addIcon($icon, $before=true, $labeled=false) { |
|
| 66 | 66 | $this->removeArrow(); |
| 67 | - $this->addIconP($icon,$before,$labeled); |
|
| 67 | + $this->addIconP($icon, $before, $labeled); |
|
| 68 | 68 | return $this->getElementById("text-".$this->identifier, $this->content)->setWrapAfter(""); |
| 69 | 69 | } |
| 70 | 70 | |
| 71 | - public function addIcons($icons){ |
|
| 71 | + public function addIcons($icons) { |
|
| 72 | 72 | $count=$this->count(); |
| 73 | - for ($i=0;$i<\sizeof($icons) && $i<$count;$i++){ |
|
| 73 | + for ($i=0; $i<\sizeof($icons) && $i<$count; $i++) { |
|
| 74 | 74 | $this->getItem($i)->addIcon($icons[$i]); |
| 75 | 75 | } |
| 76 | 76 | } |
@@ -81,33 +81,33 @@ discard block |
||
| 81 | 81 | * @param number $position |
| 82 | 82 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown |
| 83 | 83 | */ |
| 84 | - public function insertItem($item,$position=0){ |
|
| 84 | + public function insertItem($item, $position=0) { |
|
| 85 | 85 | $itemO=$this->beforeAddItem($item); |
| 86 | - $start = array_slice($this->items, 0, $position); |
|
| 87 | - $end = array_slice($this->items, $position); |
|
| 88 | - $start[] = $item; |
|
| 86 | + $start=array_slice($this->items, 0, $position); |
|
| 87 | + $end=array_slice($this->items, $position); |
|
| 88 | + $start[]=$item; |
|
| 89 | 89 | $this->items=array_merge($start, $end); |
| 90 | 90 | return $itemO; |
| 91 | 91 | } |
| 92 | 92 | |
| 93 | - protected function removeArrow(){ |
|
| 94 | - if(\sizeof($this->content)>1){ |
|
| 93 | + protected function removeArrow() { |
|
| 94 | + if (\sizeof($this->content)>1) { |
|
| 95 | 95 | unset($this->content["arrow"]); |
| 96 | 96 | $this->content=\array_values($this->content); |
| 97 | 97 | } |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - protected function beforeAddItem($item,$value=NULL,$image=NULL,$description=NULL){ |
|
| 100 | + protected function beforeAddItem($item, $value=NULL, $image=NULL, $description=NULL) { |
|
| 101 | 101 | $itemO=$item; |
| 102 | - if(\is_array($item)){ |
|
| 102 | + if (\is_array($item)) { |
|
| 103 | 103 | $description=JArray::getValue($item, "description", 3); |
| 104 | 104 | $value=JArray::getValue($item, "value", 1); |
| 105 | 105 | $image=JArray::getValue($item, "image", 2); |
| 106 | 106 | $item=JArray::getValue($item, "item", 0); |
| 107 | 107 | } |
| 108 | - if(!$item instanceof HtmlDropdownItem){ |
|
| 109 | - $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items),$item,$value,$image,$description); |
|
| 110 | - }elseif($itemO instanceof HtmlDropdownItem){ |
|
| 108 | + if (!$item instanceof HtmlDropdownItem) { |
|
| 109 | + $itemO=new HtmlDropdownItem("dd-item-".$this->identifier."-".\sizeof($this->items), $item, $value, $image, $description); |
|
| 110 | + }elseif ($itemO instanceof HtmlDropdownItem) { |
|
| 111 | 111 | $this->addToProperty("class", "vertical"); |
| 112 | 112 | } |
| 113 | 113 | return $itemO; |
@@ -120,11 +120,11 @@ discard block |
||
| 120 | 120 | $this->addItem($function($object)); |
| 121 | 121 | } |
| 122 | 122 | |
| 123 | - public function addInput($name){ |
|
| 124 | - if(!isset($name)) |
|
| 123 | + public function addInput($name) { |
|
| 124 | + if (!isset($name)) |
|
| 125 | 125 | $name="input-".$this->identifier; |
| 126 | 126 | $this->setAction("activate"); |
| 127 | - $this->input=new HtmlInput($name,"hidden"); |
|
| 127 | + $this->input=new HtmlInput($name, "hidden"); |
|
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | /** |
@@ -133,15 +133,15 @@ discard block |
||
| 133 | 133 | * @param string $icon |
| 134 | 134 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
| 135 | 135 | */ |
| 136 | - public function addSearchInputItem($placeHolder=NULL,$icon=NULL){ |
|
| 137 | - return $this->addItem(HtmlDropdownItem::searchInput($placeHolder,$icon)); |
|
| 136 | + public function addSearchInputItem($placeHolder=NULL, $icon=NULL) { |
|
| 137 | + return $this->addItem(HtmlDropdownItem::searchInput($placeHolder, $icon)); |
|
| 138 | 138 | } |
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * Adds a divider item |
| 142 | 142 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
| 143 | 143 | */ |
| 144 | - public function addDividerItem(){ |
|
| 144 | + public function addDividerItem() { |
|
| 145 | 145 | return $this->addItem(HtmlDropdownItem::divider()); |
| 146 | 146 | } |
| 147 | 147 | |
@@ -151,8 +151,8 @@ discard block |
||
| 151 | 151 | * @param string $icon |
| 152 | 152 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown |
| 153 | 153 | */ |
| 154 | - public function addHeaderItem($caption=NULL,$icon=NULL){ |
|
| 155 | - return $this->addItem(HtmlDropdownItem::header($caption,$icon)); |
|
| 154 | + public function addHeaderItem($caption=NULL, $icon=NULL) { |
|
| 155 | + return $this->addItem(HtmlDropdownItem::header($caption, $icon)); |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | /** |
@@ -161,7 +161,7 @@ discard block |
||
| 161 | 161 | * @param string $color |
| 162 | 162 | * @return \Ajax\semantic\html\content\HtmlDropdownItem|unknown |
| 163 | 163 | */ |
| 164 | - public function addCircularLabelItem($caption,$color){ |
|
| 164 | + public function addCircularLabelItem($caption, $color) { |
|
| 165 | 165 | return $this->addItem(HtmlDropdownItem::circular($caption, $color)); |
| 166 | 166 | } |
| 167 | 167 | |
@@ -170,17 +170,17 @@ discard block |
||
| 170 | 170 | * @param string $image |
| 171 | 171 | * @return \Ajax\semantic\html\content\HtmlDropdownItem |
| 172 | 172 | */ |
| 173 | - public function addMiniAvatarImageItem($caption,$image){ |
|
| 173 | + public function addMiniAvatarImageItem($caption, $image) { |
|
| 174 | 174 | return $this->addItem(HtmlDropdownItem::avatar($caption, $image)); |
| 175 | 175 | } |
| 176 | 176 | |
| 177 | - public function addItems($items){ |
|
| 178 | - if(\is_array($items) && $this->_associative){ |
|
| 179 | - foreach ($items as $k=>$v){ |
|
| 177 | + public function addItems($items) { |
|
| 178 | + if (\is_array($items) && $this->_associative) { |
|
| 179 | + foreach ($items as $k=>$v) { |
|
| 180 | 180 | $this->addItem($v)->setData($k); |
| 181 | 181 | } |
| 182 | - }else{ |
|
| 183 | - foreach ($items as $item){ |
|
| 182 | + } else { |
|
| 183 | + foreach ($items as $item) { |
|
| 184 | 184 | $this->addItem($item); |
| 185 | 185 | } |
| 186 | 186 | } |
@@ -192,98 +192,98 @@ discard block |
||
| 192 | 192 | * @param array $values |
| 193 | 193 | * @return HtmlCollection |
| 194 | 194 | */ |
| 195 | - public function setPropertyValues($property,$values){ |
|
| 195 | + public function setPropertyValues($property, $values) { |
|
| 196 | 196 | $i=0; |
| 197 | - if(\is_array($values)===false){ |
|
| 198 | - $values=\array_fill(0, $this->count(),$values); |
|
| 197 | + if (\is_array($values)===false) { |
|
| 198 | + $values=\array_fill(0, $this->count(), $values); |
|
| 199 | 199 | } |
| 200 | - foreach ($values as $value){ |
|
| 200 | + foreach ($values as $value) { |
|
| 201 | 201 | $c=$this->items[$i++]; |
| 202 | - if(isset($c)){ |
|
| 203 | - $c->setProperty($property,$value); |
|
| 202 | + if (isset($c)) { |
|
| 203 | + $c->setProperty($property, $value); |
|
| 204 | 204 | } |
| 205 | - else{ |
|
| 205 | + else { |
|
| 206 | 206 | return $this; |
| 207 | 207 | } |
| 208 | 208 | } |
| 209 | 209 | return $this; |
| 210 | 210 | } |
| 211 | 211 | |
| 212 | - public function each($callBack){ |
|
| 213 | - foreach ($this->items as $index=>$value){ |
|
| 214 | - $callBack($index,$value); |
|
| 212 | + public function each($callBack) { |
|
| 213 | + foreach ($this->items as $index=>$value) { |
|
| 214 | + $callBack($index, $value); |
|
| 215 | 215 | } |
| 216 | 216 | return $this; |
| 217 | 217 | } |
| 218 | 218 | |
| 219 | - public function getItem($index){ |
|
| 219 | + public function getItem($index) { |
|
| 220 | 220 | return $this->items[$index]; |
| 221 | 221 | } |
| 222 | 222 | |
| 223 | 223 | /** |
| 224 | 224 | * @return int |
| 225 | 225 | */ |
| 226 | - public function count(){ |
|
| 226 | + public function count() { |
|
| 227 | 227 | return \sizeof($this->items); |
| 228 | 228 | } |
| 229 | 229 | /** |
| 230 | 230 | * @param boolean $dropdown |
| 231 | 231 | */ |
| 232 | - public function asDropdown($dropdown){ |
|
| 233 | - if($dropdown===false){ |
|
| 232 | + public function asDropdown($dropdown) { |
|
| 233 | + if ($dropdown===false) { |
|
| 234 | 234 | $this->_template=include dirname(__FILE__).'/../templates/tplDropdownMenu.php'; |
| 235 | 235 | $dropdown="menu"; |
| 236 | - }else{ |
|
| 236 | + } else { |
|
| 237 | 237 | $dropdown="dropdown"; |
| 238 | 238 | $this->mClass="menu"; |
| 239 | 239 | } |
| 240 | - return $this->addToPropertyCtrl("class", $dropdown,array("menu","dropdown")); |
|
| 240 | + return $this->addToPropertyCtrl("class", $dropdown, array("menu", "dropdown")); |
|
| 241 | 241 | } |
| 242 | 242 | |
| 243 | - public function setVertical(){ |
|
| 244 | - return $this->addToPropertyCtrl("class", "vertical",array("vertical")); |
|
| 243 | + public function setVertical() { |
|
| 244 | + return $this->addToPropertyCtrl("class", "vertical", array("vertical")); |
|
| 245 | 245 | } |
| 246 | 246 | |
| 247 | - public function setInline(){ |
|
| 248 | - return $this->addToPropertyCtrl("class", "inline",["inline"]); |
|
| 247 | + public function setInline() { |
|
| 248 | + return $this->addToPropertyCtrl("class", "inline", ["inline"]); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | - public function setSimple(){ |
|
| 252 | - return $this->addToPropertyCtrl("class", "simple",array("simple")); |
|
| 251 | + public function setSimple() { |
|
| 252 | + return $this->addToPropertyCtrl("class", "simple", array("simple")); |
|
| 253 | 253 | } |
| 254 | 254 | |
| 255 | - public function asButton($floating=false){ |
|
| 255 | + public function asButton($floating=false) { |
|
| 256 | 256 | $this->removeArrow(); |
| 257 | - if($floating) |
|
| 257 | + if ($floating) |
|
| 258 | 258 | $this->addToProperty("class", "floating"); |
| 259 | 259 | $this->removePropertyValue("class", "selection"); |
| 260 | 260 | return $this->addToProperty("class", "button"); |
| 261 | 261 | } |
| 262 | 262 | |
| 263 | - public function asSelect($name=NULL,$multiple=false,$selection=true){ |
|
| 263 | + public function asSelect($name=NULL, $multiple=false, $selection=true) { |
|
| 264 | 264 | $this->_multiple=$multiple; |
| 265 | - if(isset($name)) |
|
| 265 | + if (isset($name)) |
|
| 266 | 266 | $this->addInput($name); |
| 267 | - if($multiple){ |
|
| 267 | + if ($multiple) { |
|
| 268 | 268 | $this->addToProperty("class", "multiple"); |
| 269 | 269 | } |
| 270 | - if ($selection){ |
|
| 271 | - if($this->propertyContains("class", "button")===false) |
|
| 272 | - $this->addToPropertyCtrl("class", "selection",array("selection")); |
|
| 270 | + if ($selection) { |
|
| 271 | + if ($this->propertyContains("class", "button")===false) |
|
| 272 | + $this->addToPropertyCtrl("class", "selection", array("selection")); |
|
| 273 | 273 | } |
| 274 | 274 | return $this; |
| 275 | 275 | } |
| 276 | 276 | |
| 277 | - public function asSearch($name=NULL,$multiple=false,$selection=true){ |
|
| 278 | - $this->asSelect($name,$multiple,$selection); |
|
| 277 | + public function asSearch($name=NULL, $multiple=false, $selection=true) { |
|
| 278 | + $this->asSelect($name, $multiple, $selection); |
|
| 279 | 279 | return $this->addToProperty("class", "search"); |
| 280 | 280 | } |
| 281 | 281 | |
| 282 | - public function setSelect($name=NULL,$multiple=false){ |
|
| 283 | - if(!isset($name)) |
|
| 282 | + public function setSelect($name=NULL, $multiple=false) { |
|
| 283 | + if (!isset($name)) |
|
| 284 | 284 | $name="select-".$this->identifier; |
| 285 | 285 | $this->input=null; |
| 286 | - if($multiple){ |
|
| 286 | + if ($multiple) { |
|
| 287 | 287 | $this->setProperty("multiple", true); |
| 288 | 288 | $this->addToProperty("class", "multiple"); |
| 289 | 289 | } |
@@ -291,37 +291,37 @@ discard block |
||
| 291 | 291 | $this->tagName="select"; |
| 292 | 292 | $this->setProperty("name", $name); |
| 293 | 293 | $this->content=null; |
| 294 | - foreach ($this->items as $item){ |
|
| 294 | + foreach ($this->items as $item) { |
|
| 295 | 295 | $item->asOption(); |
| 296 | 296 | } |
| 297 | 297 | return $this; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - public function asSubmenu($pointing=NULL){ |
|
| 300 | + public function asSubmenu($pointing=NULL) { |
|
| 301 | 301 | $this->setClass("ui dropdown link item"); |
| 302 | - if(isset($pointing)){ |
|
| 302 | + if (isset($pointing)) { |
|
| 303 | 303 | $this->setPointing($pointing); |
| 304 | 304 | } |
| 305 | 305 | return $this; |
| 306 | 306 | } |
| 307 | 307 | |
| 308 | - public function setPointing($value=Direction::NONE){ |
|
| 309 | - return $this->addToPropertyCtrl("class", $value." pointing",Direction::getConstantValues("pointing")); |
|
| 308 | + public function setPointing($value=Direction::NONE) { |
|
| 309 | + return $this->addToPropertyCtrl("class", $value." pointing", Direction::getConstantValues("pointing")); |
|
| 310 | 310 | } |
| 311 | 311 | |
| 312 | - public function setValue($value){ |
|
| 312 | + public function setValue($value) { |
|
| 313 | 313 | $this->value=$value; |
| 314 | 314 | return $this; |
| 315 | 315 | } |
| 316 | - private function applyValue(){ |
|
| 316 | + private function applyValue() { |
|
| 317 | 317 | $value=$this->value; |
| 318 | - if(isset($this->input) && isset($value)){ |
|
| 318 | + if (isset($this->input) && isset($value)) { |
|
| 319 | 319 | $this->input->setProperty("value", $value); |
| 320 | - }else{ |
|
| 320 | + } else { |
|
| 321 | 321 | $this->setProperty("value", $value); |
| 322 | 322 | } |
| 323 | 323 | $textElement=$this->getElementById("text-".$this->identifier, $this->content); |
| 324 | - if(isset($textElement) && !$this->_multiple) |
|
| 324 | + if (isset($textElement) && !$this->_multiple) |
|
| 325 | 325 | $textElement->setContent($value); |
| 326 | 326 | return $this; |
| 327 | 327 | } |
@@ -331,9 +331,9 @@ discard block |
||
| 331 | 331 | * @see BaseHtml::run() |
| 332 | 332 | */ |
| 333 | 333 | public function run(JsUtils $js) { |
| 334 | - if($this->propertyContains("class", "simple")===false){ |
|
| 335 | - if(isset($this->_bsComponent)===false){ |
|
| 336 | - $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier,$this->_params); |
|
| 334 | + if ($this->propertyContains("class", "simple")===false) { |
|
| 335 | + if (isset($this->_bsComponent)===false) { |
|
| 336 | + $this->_bsComponent=$js->semantic()->dropdown("#".$this->identifier, $this->_params); |
|
| 337 | 337 | $this->_bsComponent->setItemSelector(".item"); |
| 338 | 338 | } |
| 339 | 339 | $this->addEventsOnRun($js); |
@@ -341,44 +341,44 @@ discard block |
||
| 341 | 341 | } |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - public function setCompact(){ |
|
| 344 | + public function setCompact() { |
|
| 345 | 345 | return $this->addToPropertyCtrl("class", "compact", array("compact")); |
| 346 | 346 | } |
| 347 | 347 | |
| 348 | - public function setAction($action){ |
|
| 348 | + public function setAction($action) { |
|
| 349 | 349 | $this->_params["action"]=$action; |
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - public function setOn($on){ |
|
| 352 | + public function setOn($on) { |
|
| 353 | 353 | $this->_params["on"]=$on; |
| 354 | 354 | } |
| 355 | 355 | |
| 356 | - public function setShowOnFocus($value){ |
|
| 356 | + public function setShowOnFocus($value) { |
|
| 357 | 357 | $this->_params["showOnFocus"]=$value; |
| 358 | 358 | } |
| 359 | 359 | |
| 360 | - public function setFullTextSearch($value){ |
|
| 360 | + public function setFullTextSearch($value) { |
|
| 361 | 361 | $this->_params["fullTextSearch"]=$value; |
| 362 | 362 | } |
| 363 | 363 | |
| 364 | 364 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 365 | 365 | $this->applyValue(); |
| 366 | - return parent::compile($js,$view); |
|
| 366 | + return parent::compile($js, $view); |
|
| 367 | 367 | } |
| 368 | 368 | |
| 369 | 369 | public function getInput() { |
| 370 | 370 | return $this->input; |
| 371 | 371 | } |
| 372 | 372 | public function addAction($action, $direction=Direction::RIGHT, $icon=NULL, $labeled=false) { |
| 373 | - return $this->_addAction($this, $action,$direction,$icon,$labeled); |
|
| 373 | + return $this->_addAction($this, $action, $direction, $icon, $labeled); |
|
| 374 | 374 | } |
| 375 | 375 | |
| 376 | - public function setIcon($icon="dropdown"){ |
|
| 376 | + public function setIcon($icon="dropdown") { |
|
| 377 | 377 | $this->content["arrow"]=new HtmlIcon($this->identifier."-icon", $icon); |
| 378 | 378 | return $this; |
| 379 | 379 | } |
| 380 | 380 | |
| 381 | - public function jsAddItem($caption){ |
|
| 381 | + public function jsAddItem($caption) { |
|
| 382 | 382 | $js="var first=$('#{$this->identifier} .item').first();if(first!=undefined){var new =first.clone();first.parent().append(new);first.html('{$caption}};')"; |
| 383 | 383 | return $js; |
| 384 | 384 | } |
@@ -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)."console.log(result);return result;}"); |
| 173 | 173 | } |
@@ -7,7 +7,7 @@ discard block |
||
| 7 | 7 | * @version 1.001 |
| 8 | 8 | * Generates a JSON field validator |
| 9 | 9 | */ |
| 10 | -class FieldValidation implements \JsonSerializable{ |
|
| 10 | +class FieldValidation implements \JsonSerializable { |
|
| 11 | 11 | /** |
| 12 | 12 | * @var string |
| 13 | 13 | */ |
@@ -24,7 +24,7 @@ discard block |
||
| 24 | 24 | |
| 25 | 25 | protected $optional; |
| 26 | 26 | |
| 27 | - public function __construct($identifier){ |
|
| 27 | + public function __construct($identifier) { |
|
| 28 | 28 | $this->identifier=$identifier; |
| 29 | 29 | $this->rules=[]; |
| 30 | 30 | } |
@@ -48,22 +48,22 @@ discard block |
||
| 48 | 48 | * @param string $value |
| 49 | 49 | * @return Rule |
| 50 | 50 | */ |
| 51 | - public function addRule($type,$prompt=NULL,$value=NULL){ |
|
| 52 | - if($type instanceof Rule) |
|
| 51 | + public function addRule($type, $prompt=NULL, $value=NULL) { |
|
| 52 | + if ($type instanceof Rule) |
|
| 53 | 53 | $rule=$type; |
| 54 | - else if(\is_array($type)){ |
|
| 54 | + else if (\is_array($type)) { |
|
| 55 | 55 | $value=JArray::getValue($type, "value", 2); |
| 56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
| 57 | 57 | $type=JArray::getValue($type, "type", 0); |
| 58 | - $rule=new Rule($type,$prompt,$value); |
|
| 59 | - }else |
|
| 60 | - $rule=new Rule($type,$prompt,$value); |
|
| 58 | + $rule=new Rule($type, $prompt, $value); |
|
| 59 | + } else |
|
| 60 | + $rule=new Rule($type, $prompt, $value); |
|
| 61 | 61 | $this->rules[]=$rule; |
| 62 | 62 | return $rule; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - public function jsonSerialize(){ |
|
| 66 | - return ["identifier"=>$this->identifier,"rules"=>$this->rules]; |
|
| 65 | + public function jsonSerialize() { |
|
| 66 | + return ["identifier"=>$this->identifier, "rules"=>$this->rules]; |
|
| 67 | 67 | } |
| 68 | 68 | |
| 69 | 69 | public function setDepends($depends) { |
@@ -49,15 +49,16 @@ |
||
| 49 | 49 | * @return Rule |
| 50 | 50 | */ |
| 51 | 51 | public function addRule($type,$prompt=NULL,$value=NULL){ |
| 52 | - if($type instanceof Rule) |
|
| 53 | - $rule=$type; |
|
| 54 | - else if(\is_array($type)){ |
|
| 52 | + if($type instanceof Rule) { |
|
| 53 | + $rule=$type; |
|
| 54 | + } else if(\is_array($type)){ |
|
| 55 | 55 | $value=JArray::getValue($type, "value", 2); |
| 56 | 56 | $prompt=JArray::getValue($type, "prompt", 1); |
| 57 | 57 | $type=JArray::getValue($type, "type", 0); |
| 58 | 58 | $rule=new Rule($type,$prompt,$value); |
| 59 | - }else |
|
| 60 | - $rule=new Rule($type,$prompt,$value); |
|
| 59 | + } else { |
|
| 60 | + $rule=new Rule($type,$prompt,$value); |
|
| 61 | + } |
|
| 61 | 62 | $this->rules[]=$rule; |
| 62 | 63 | return $rule; |
| 63 | 64 | } |
@@ -17,8 +17,8 @@ discard block |
||
| 17 | 17 | * @param string $action one of "select","auto","activate","combo","nothing","hide" |
| 18 | 18 | * @return \Ajax\semantic\components\Dropdown |
| 19 | 19 | */ |
| 20 | - public function setAction($action){ |
|
| 21 | - return $this->setParamCtrl("action", $action,array("select","auto","activate","combo","nothing","hide")); |
|
| 20 | + public function setAction($action) { |
|
| 21 | + return $this->setParamCtrl("action", $action, array("select", "auto", "activate", "combo", "nothing", "hide")); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -26,15 +26,15 @@ discard block |
||
| 26 | 26 | * @param string $event Event used to trigger dropdown (Hover, Click, Custom Event) |
| 27 | 27 | * @return \Ajax\semantic\components\Dropdown |
| 28 | 28 | */ |
| 29 | - public function setOn($event){ |
|
| 29 | + public function setOn($event) { |
|
| 30 | 30 | return $this->setParam("on", $event); |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function setFullTextSearch($value){ |
|
| 33 | + public function setFullTextSearch($value) { |
|
| 34 | 34 | return $this->setParam("fullTextSearch", $value); |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | - public function setShowOnFocus($value){ |
|
| 37 | + public function setShowOnFocus($value) { |
|
| 38 | 38 | return $this->setParam("showOnFocus", $value); |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -16,9 +16,9 @@ discard block |
||
| 16 | 16 | protected $ajaxLoader='<span></span><span></span><span></span><span></span><span></span>'; |
| 17 | 17 | |
| 18 | 18 | abstract public function getUrl($url); |
| 19 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
| 19 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
| 20 | 20 | |
| 21 | - protected function _ajax($method,$url,$responseElement="",$parameters=[]) { |
|
| 21 | + protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 22 | 22 | $jsCallback=null; |
| 23 | 23 | $attr="id"; |
| 24 | 24 | $hasLoader=true; |
@@ -35,78 +35,78 @@ discard block |
||
| 35 | 35 | $retour=$this->_getAjaxUrl($url, $attr); |
| 36 | 36 | $responseElement=$this->_getResponseElement($responseElement); |
| 37 | 37 | $retour.="var self=this;\n"; |
| 38 | - if($hasLoader===true && JString::isNotNull($responseElement)){ |
|
| 38 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
| 39 | 39 | $this->addLoading($retour, $responseElement); |
| 40 | 40 | } |
| 41 | - $async=($async)?"true":"false"; |
|
| 42 | - $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'","async"=>$async]; |
|
| 43 | - if(isset($params)){ |
|
| 41 | + $async=($async) ? "true" : "false"; |
|
| 42 | + $ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'", "async"=>$async]; |
|
| 43 | + if (isset($params)) { |
|
| 44 | 44 | $ajaxParameters["data"]=self::_correctParams($params); |
| 45 | 45 | } |
| 46 | - if(isset($headers)){ |
|
| 46 | + if (isset($headers)) { |
|
| 47 | 47 | $ajaxParameters["headers"]=$headers; |
| 48 | 48 | } |
| 49 | 49 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 50 | 50 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 51 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
| 52 | - $retour=$this->_addJsCondition($jsCondition,$retour); |
|
| 51 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
| 52 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 53 | 53 | if ($immediatly) |
| 54 | 54 | $this->jquery_code_for_compile[]=$retour; |
| 55 | 55 | return $retour; |
| 56 | 56 | } |
| 57 | 57 | |
| 58 | - protected function createAjaxParameters(&$original,$parameters){ |
|
| 59 | - $validParameters=["dataType"=>"'%value%'","beforeSend"=>"function(jqXHR,settings){%value%}","complete"=>"function(jqXHR){%value%}"]; |
|
| 60 | - foreach ($validParameters as $param=>$mask){ |
|
| 61 | - if(isset($parameters[$param])){ |
|
| 58 | + protected function createAjaxParameters(&$original, $parameters) { |
|
| 59 | + $validParameters=["dataType"=>"'%value%'", "beforeSend"=>"function(jqXHR,settings){%value%}", "complete"=>"function(jqXHR){%value%}"]; |
|
| 60 | + foreach ($validParameters as $param=>$mask) { |
|
| 61 | + if (isset($parameters[$param])) { |
|
| 62 | 62 | $original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
| 63 | 63 | } |
| 64 | 64 | } |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | - protected function implodeAjaxParameters($ajaxParameters){ |
|
| 68 | - $s = ''; foreach ($ajaxParameters as $k=>$v) { if ($s !== '') { $s .= ','; } $s .= "'{$k}':{$v}"; } |
|
| 67 | + protected function implodeAjaxParameters($ajaxParameters) { |
|
| 68 | + $s=''; foreach ($ajaxParameters as $k=>$v) { if ($s!=='') { $s.=','; } $s.="'{$k}':{$v}"; } |
|
| 69 | 69 | return $s; |
| 70 | 70 | } |
| 71 | 71 | |
| 72 | - protected function _addJsCondition($jsCondition,$jsSource){ |
|
| 73 | - if(isset($jsCondition)){ |
|
| 72 | + protected function _addJsCondition($jsCondition, $jsSource) { |
|
| 73 | + if (isset($jsCondition)) { |
|
| 74 | 74 | return "if(".$jsCondition."){\n".$jsSource."\n}"; |
| 75 | 75 | } |
| 76 | 76 | return $jsSource; |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | |
| 80 | - protected function _getAjaxUrl($url,$attr){ |
|
| 80 | + protected function _getAjaxUrl($url, $attr) { |
|
| 81 | 81 | $url=$this->_correctAjaxUrl($url); |
| 82 | 82 | $retour="url='".$url."';"; |
| 83 | 83 | $slash="/"; |
| 84 | - if(JString::endswith($url, "/")===true){ |
|
| 84 | + if (JString::endswith($url, "/")===true) { |
|
| 85 | 85 | $slash=""; |
| 86 | 86 | } |
| 87 | - if(JString::isNotNull($attr)){ |
|
| 88 | - if ($attr==="value"){ |
|
| 87 | + if (JString::isNotNull($attr)) { |
|
| 88 | + if ($attr==="value") { |
|
| 89 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 90 | - }elseif ($attr==="html"){ |
|
| 90 | + }elseif ($attr==="html") { |
|
| 91 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 92 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 92 | + }elseif (\substr($attr, 0, 3)==="js:") { |
|
| 93 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 94 | - }elseif($attr!==null && $attr!=="") |
|
| 94 | + }elseif ($attr!==null && $attr!=="") |
|
| 95 | 95 | $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
| 96 | 96 | } |
| 97 | 97 | return $retour; |
| 98 | 98 | } |
| 99 | 99 | |
| 100 | - protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback){ |
|
| 101 | - $retour="";$call=null; |
|
| 100 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback) { |
|
| 101 | + $retour=""; $call=null; |
|
| 102 | 102 | if (JString::isNotNull($responseElement)) { |
| 103 | - if(isset($ajaxTransition)){ |
|
| 103 | + if (isset($ajaxTransition)) { |
|
| 104 | 104 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 105 | - }elseif(isset($this->ajaxTransition)){ |
|
| 105 | + }elseif (isset($this->ajaxTransition)) { |
|
| 106 | 106 | $call=$this->ajaxTransition; |
| 107 | 107 | } |
| 108 | - if(\is_callable($call)) |
|
| 109 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 108 | + if (\is_callable($call)) |
|
| 109 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
| 110 | 110 | else |
| 111 | 111 | $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
| 112 | 112 | } |
@@ -114,7 +114,7 @@ discard block |
||
| 114 | 114 | return $retour; |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | - protected function _getResponseElement($responseElement){ |
|
| 117 | + protected function _getResponseElement($responseElement) { |
|
| 118 | 118 | if (JString::isNotNull($responseElement)) { |
| 119 | 119 | $responseElement=Javascript::prep_value($responseElement); |
| 120 | 120 | $responseElement=Javascript::prep_jquery_selector($responseElement); |
@@ -125,26 +125,26 @@ discard block |
||
| 125 | 125 | protected function _correctAjaxUrl($url) { |
| 126 | 126 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
| 127 | 127 | $url=substr($url, 0, strlen($url)-1); |
| 128 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
| 128 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
| 129 | 129 | $url=$this->getUrl($url); |
| 130 | 130 | } |
| 131 | 131 | return $url; |
| 132 | 132 | } |
| 133 | 133 | |
| 134 | - public static function _correctParams($params){ |
|
| 135 | - if(JString::isNull($params)){ |
|
| 134 | + public static function _correctParams($params) { |
|
| 135 | + if (JString::isNull($params)) { |
|
| 136 | 136 | return ""; |
| 137 | 137 | } |
| 138 | - if(\preg_match("@^\{.*?\}$@", $params)){ |
|
| 138 | + if (\preg_match("@^\{.*?\}$@", $params)) { |
|
| 139 | 139 | return '$.param('.$params.')'; |
| 140 | 140 | } |
| 141 | 141 | return $params; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public static function _implodeParams($parameters){ |
|
| 144 | + public static function _implodeParams($parameters) { |
|
| 145 | 145 | $allParameters=[]; |
| 146 | - foreach ($parameters as $params){ |
|
| 147 | - if(isset($params)) |
|
| 146 | + foreach ($parameters as $params) { |
|
| 147 | + if (isset($params)) |
|
| 148 | 148 | $allParameters[]=self::_correctParams($params); |
| 149 | 149 | } |
| 150 | 150 | return \implode("+'&'+", $allParameters); |
@@ -162,19 +162,19 @@ discard block |
||
| 162 | 162 | $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
| 163 | 163 | } |
| 164 | 164 | |
| 165 | - protected function setAjaxDataCall($params){ |
|
| 165 | + protected function setAjaxDataCall($params) { |
|
| 166 | 166 | $result=null; |
| 167 | - if(!\is_callable($params)){ |
|
| 168 | - $result=function ($responseElement,$jqueryDone="html") use($params){ |
|
| 169 | - return AjaxTransition::{$params}($responseElement,$jqueryDone); |
|
| 167 | + if (!\is_callable($params)) { |
|
| 168 | + $result=function($responseElement, $jqueryDone="html") use($params){ |
|
| 169 | + return AjaxTransition::{$params}($responseElement, $jqueryDone); |
|
| 170 | 170 | }; |
| 171 | 171 | } |
| 172 | 172 | return $result; |
| 173 | 173 | } |
| 174 | 174 | |
| 175 | - protected function setDefaultParameters(&$parameters,$default){ |
|
| 176 | - foreach ($default as $k=>$v){ |
|
| 177 | - if(!isset($parameters[$k])) |
|
| 175 | + protected function setDefaultParameters(&$parameters, $default) { |
|
| 176 | + foreach ($default as $k=>$v) { |
|
| 177 | + if (!isset($parameters[$k])) |
|
| 178 | 178 | $parameters[$k]=$v; |
| 179 | 179 | } |
| 180 | 180 | } |
@@ -188,8 +188,8 @@ discard block |
||
| 188 | 188 | * @param string $url The url of the request |
| 189 | 189 | * @param string $responseElement selector of the HTML element displaying the answer |
| 190 | 190 | */ |
| 191 | - private function _get($url, $responseElement="",$parameters=[]) { |
|
| 192 | - return $this->_ajax("get", $url,$responseElement,$parameters); |
|
| 191 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
| 192 | + return $this->_ajax("get", $url, $responseElement, $parameters); |
|
| 193 | 193 | } |
| 194 | 194 | |
| 195 | 195 | /** |
@@ -198,9 +198,9 @@ discard block |
||
| 198 | 198 | * @param string $responseElement selector of the HTML element displaying the answer |
| 199 | 199 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 200 | 200 | */ |
| 201 | - public function get($url, $responseElement="",$parameters=[]) { |
|
| 201 | + public function get($url, $responseElement="", $parameters=[]) { |
|
| 202 | 202 | $parameters["immediatly"]=true; |
| 203 | - return $this->_get($url,$responseElement,$parameters); |
|
| 203 | + return $this->_get($url, $responseElement, $parameters); |
|
| 204 | 204 | } |
| 205 | 205 | |
| 206 | 206 | /** |
@@ -210,9 +210,9 @@ discard block |
||
| 210 | 210 | * @param string $responseElement selector of the HTML element displaying the answer |
| 211 | 211 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 212 | 212 | */ |
| 213 | - public function ajax($method,$url, $responseElement="", $parameters=[]) { |
|
| 213 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 214 | 214 | $parameters["immediatly"]=true; |
| 215 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
| 215 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | /** |
@@ -222,9 +222,9 @@ discard block |
||
| 222 | 222 | * @param string $responseElement selector of the HTML element displaying the answer |
| 223 | 223 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 224 | 224 | */ |
| 225 | - public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) { |
|
| 225 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
| 226 | 226 | $parameters["immediatly"]=false; |
| 227 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
| 227 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
| 228 | 228 | } |
| 229 | 229 | |
| 230 | 230 | /** |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * @param string $context |
| 238 | 238 | * @param boolean $immediatly |
| 239 | 239 | */ |
| 240 | - private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document",$immediatly=false) { |
|
| 240 | + private function _json($url, $method="get", $params="{}", $jsCallback=NULL, $attr="id", $context="document", $immediatly=false) { |
|
| 241 | 241 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 242 | 242 | $retour=$this->_getAjaxUrl($url, $attr); |
| 243 | 243 | $retour.="$.{$method}(url,".$params.").done(function( data ) {\n"; |
@@ -260,8 +260,8 @@ discard block |
||
| 260 | 260 | * @param string $context |
| 261 | 261 | * @param boolean $immediatly |
| 262 | 262 | */ |
| 263 | - public function json($url, $method="get", $params="{}", $jsCallback=NULL,$context="document",$immediatly=false) { |
|
| 264 | - return $this->_json($url,$method,$params,$jsCallback,NULL,$context,$immediatly); |
|
| 263 | + public function json($url, $method="get", $params="{}", $jsCallback=NULL, $context="document", $immediatly=false) { |
|
| 264 | + return $this->_json($url, $method, $params, $jsCallback, NULL, $context, $immediatly); |
|
| 265 | 265 | } |
| 266 | 266 | |
| 267 | 267 | /** |
@@ -271,7 +271,7 @@ discard block |
||
| 271 | 271 | * @param string $url the request address |
| 272 | 272 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
| 273 | 273 | */ |
| 274 | - public function jsonOn($event,$element, $url,$parameters=array()) { |
|
| 274 | + public function jsonOn($event, $element, $url, $parameters=array()) { |
|
| 275 | 275 | $preventDefault=true; |
| 276 | 276 | $stopPropagation=true; |
| 277 | 277 | $jsCallback=null; |
@@ -281,7 +281,7 @@ discard block |
||
| 281 | 281 | $params="{}"; |
| 282 | 282 | $immediatly=true; |
| 283 | 283 | extract($parameters); |
| 284 | - return $this->_add_event($element, $this->_json($url,$method, $params,$jsCallback, $attr,$context), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 284 | + return $this->_add_event($element, $this->_json($url, $method, $params, $jsCallback, $attr, $context), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -292,8 +292,8 @@ discard block |
||
| 292 | 292 | * @param string $jsCallback javascript code to execute after the request |
| 293 | 293 | * @param string $context jquery DOM element, array container. |
| 294 | 294 | */ |
| 295 | - public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL,$context=NULL) { |
|
| 296 | - return $this->json($url, $method, $params, $jsCallback, $context,false); |
|
| 295 | + public function jsonDeferred($url, $method="get", $params="{}", $jsCallback=NULL, $context=NULL) { |
|
| 296 | + return $this->json($url, $method, $params, $jsCallback, $context, false); |
|
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | /** |
@@ -306,22 +306,22 @@ discard block |
||
| 306 | 306 | * @param string $rowClass the css class for the new element |
| 307 | 307 | * @param boolean $immediatly |
| 308 | 308 | */ |
| 309 | - private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$attr="id",$immediatly=false) { |
|
| 309 | + private function _jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $attr="id", $immediatly=false) { |
|
| 310 | 310 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 311 | 311 | $retour=$this->_getAjaxUrl($url, $attr); |
| 312 | - if($context===null){ |
|
| 312 | + if ($context===null) { |
|
| 313 | 313 | $parent="$('".$maskSelector."').parent()"; |
| 314 | - $newElm = "$('#'+newId)"; |
|
| 315 | - }else{ |
|
| 314 | + $newElm="$('#'+newId)"; |
|
| 315 | + } else { |
|
| 316 | 316 | $parent=$context; |
| 317 | - $newElm = $context.".find('#'+newId)"; |
|
| 317 | + $newElm=$context.".find('#'+newId)"; |
|
| 318 | 318 | } |
| 319 | 319 | $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
| 320 | 320 | $retour.="var self = $(this);\n$.{$method}(url,".$params.").done(function( data ) {\n"; |
| 321 | 321 | $retour.=$parent.".find('._json').remove();"; |
| 322 | 322 | $retour.="\tdata=$.parseJSON(data);$.each(data, function(index, value) {\n"."\tvar created=false;var maskElm=$('".$maskSelector."').first();maskElm.hide();"."\tvar newId=(maskElm.attr('id') || 'mask')+'-'+index;"."\tvar newElm=".$newElm.";\n"."\tif(!newElm.length){\n"."\t\tnewElm=maskElm.clone(); |
| 323 | 323 | newElm.attr('id',newId);\n;newElm.addClass('{$rowClass}').removeClass('_jsonArrayModel');\nnewElm.find('[id]').each(function(){ var newId=$(this).attr('id')+'-'+index;$(this).attr('id',newId).removeClass('_jsonArrayChecked');});\n"; |
| 324 | - $retour.= $appendTo; |
|
| 324 | + $retour.=$appendTo; |
|
| 325 | 325 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
| 326 | 326 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 327 | 327 | $retour.="\t".$jsCallback."\n"."});\n"; |
@@ -340,8 +340,8 @@ discard block |
||
| 340 | 340 | * @param string $context jquery DOM element, array container. |
| 341 | 341 | * @param boolean $immediatly |
| 342 | 342 | */ |
| 343 | - public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL,$immediatly=false) { |
|
| 344 | - return $this->_jsonArray($maskSelector, $url,$method,$params,$jsCallback,$rowClass,$context,NULL,$immediatly); |
|
| 343 | + public function jsonArray($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL, $immediatly=false) { |
|
| 344 | + return $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, NULL, $immediatly); |
|
| 345 | 345 | } |
| 346 | 346 | |
| 347 | 347 | /** |
@@ -354,8 +354,8 @@ discard block |
||
| 354 | 354 | * @param string $rowClass the css class for the new element |
| 355 | 355 | * @param string $context jquery DOM element, array container. |
| 356 | 356 | */ |
| 357 | - public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL,$rowClass="_json",$context=NULL) { |
|
| 358 | - return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback,$rowClass,$context,false); |
|
| 357 | + public function jsonArrayDeferred($maskSelector, $url, $method="get", $params="{}", $jsCallback=NULL, $rowClass="_json", $context=NULL) { |
|
| 358 | + return $this->jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, false); |
|
| 359 | 359 | } |
| 360 | 360 | |
| 361 | 361 | /** |
@@ -365,18 +365,18 @@ discard block |
||
| 365 | 365 | * @param string $url the request url |
| 366 | 366 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
| 367 | 367 | */ |
| 368 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$parameters=array()) { |
|
| 368 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $parameters=array()) { |
|
| 369 | 369 | $preventDefault=true; |
| 370 | 370 | $stopPropagation=true; |
| 371 | 371 | $jsCallback=null; |
| 372 | 372 | $attr="id"; |
| 373 | 373 | $method="get"; |
| 374 | - $context = null; |
|
| 374 | + $context=null; |
|
| 375 | 375 | $params="{}"; |
| 376 | 376 | $immediatly=true; |
| 377 | 377 | $rowClass="_json"; |
| 378 | 378 | extract($parameters); |
| 379 | - return $this->_add_event($element, $this->_jsonArray($maskSelector,$url,$method, $params,$jsCallback, $rowClass, $context,$attr), $event, $preventDefault, $stopPropagation,$immediatly); |
|
| 379 | + return $this->_add_event($element, $this->_jsonArray($maskSelector, $url, $method, $params, $jsCallback, $rowClass, $context, $attr), $event, $preventDefault, $stopPropagation, $immediatly); |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | /** |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | */ |
| 389 | 389 | public function getDeferred($url, $responseElement="", $parameters=[]) { |
| 390 | 390 | $parameters["immediatly"]=false; |
| 391 | - return $this->_get($url, $responseElement,$parameters); |
|
| 391 | + return $this->_get($url, $responseElement, $parameters); |
|
| 392 | 392 | } |
| 393 | 393 | |
| 394 | 394 | /** |
@@ -401,8 +401,8 @@ discard block |
||
| 401 | 401 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null) |
| 402 | 402 | */ |
| 403 | 403 | public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
| 404 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 405 | - return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 404 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 405 | + return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | /** |
@@ -415,8 +415,8 @@ discard block |
||
| 415 | 415 | * @param array $parameters default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null) |
| 416 | 416 | */ |
| 417 | 417 | public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
| 418 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]); |
|
| 419 | - return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 418 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]); |
|
| 419 | + return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 420 | 420 | } |
| 421 | 421 | |
| 422 | 422 | /** |
@@ -443,9 +443,9 @@ discard block |
||
| 443 | 443 | return $this->getOn("click", $element, $url, $responseElement, $parameters); |
| 444 | 444 | } |
| 445 | 445 | |
| 446 | - private function _post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 446 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 447 | 447 | $parameters["params"]=$params; |
| 448 | - return $this->_ajax("POST", $url,$responseElement,$parameters); |
|
| 448 | + return $this->_ajax("POST", $url, $responseElement, $parameters); |
|
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | /** |
@@ -455,8 +455,8 @@ discard block |
||
| 455 | 455 | * @param string $params JSON parameters |
| 456 | 456 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 457 | 457 | */ |
| 458 | - public function post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 459 | - return $this->_post($url, $params,$responseElement, $parameters); |
|
| 458 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 459 | + return $this->_post($url, $params, $responseElement, $parameters); |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | /** |
@@ -467,7 +467,7 @@ discard block |
||
| 467 | 467 | * @param string $responseElement selector of the HTML element displaying the answer |
| 468 | 468 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 469 | 469 | */ |
| 470 | - public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) { |
|
| 470 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 471 | 471 | $parameters["immediatly"]=false; |
| 472 | 472 | return $this->_post($url, $params, $responseElement, $parameters); |
| 473 | 473 | } |
@@ -483,8 +483,8 @@ discard block |
||
| 483 | 483 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null) |
| 484 | 484 | */ |
| 485 | 485 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
| 486 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 487 | - return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 486 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 487 | + return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | /** |
@@ -501,27 +501,27 @@ discard block |
||
| 501 | 501 | } |
| 502 | 502 | |
| 503 | 503 | private function _postForm($url, $form, $responseElement, $parameters=[]) { |
| 504 | - $params="{}";$validation=false;$jsCallback=NULL;$attr="id";$hasLoader=true;$jqueryDone="html";$ajaxTransition=null;$immediatly=false;$jsCondition=NULL;$headers=NULL;$async=true; |
|
| 504 | + $params="{}"; $validation=false; $jsCallback=NULL; $attr="id"; $hasLoader=true; $jqueryDone="html"; $ajaxTransition=null; $immediatly=false; $jsCondition=NULL; $headers=NULL; $async=true; |
|
| 505 | 505 | \extract($parameters); |
| 506 | - $async=($async)?"true":"false"; |
|
| 506 | + $async=($async) ? "true" : "false"; |
|
| 507 | 507 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
| 508 | 508 | $retour=$this->_getAjaxUrl($url, $attr); |
| 509 | 509 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
| 510 | - if(isset($params)){ |
|
| 510 | + if (isset($params)) { |
|
| 511 | 511 | $retour.="params+='&'+".self::_correctParams($params).";\n"; |
| 512 | 512 | } |
| 513 | 513 | $responseElement=$this->_getResponseElement($responseElement); |
| 514 | 514 | $retour.="var self=this;\n"; |
| 515 | - if($hasLoader===true){ |
|
| 515 | + if ($hasLoader===true) { |
|
| 516 | 516 | $this->addLoading($retour, $responseElement); |
| 517 | 517 | } |
| 518 | - $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
|
| 519 | - if(isset($headers)){ |
|
| 518 | + $ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async]; |
|
| 519 | + if (isset($headers)) { |
|
| 520 | 520 | $ajaxParameters["headers"]=$headers; |
| 521 | 521 | } |
| 522 | 522 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 523 | 523 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
| 524 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
|
| 524 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback)."});\n"; |
|
| 525 | 525 | |
| 526 | 526 | if ($validation) { |
| 527 | 527 | $retour="$('#".$form."').validate({submitHandler: function(form) { |
@@ -571,8 +571,8 @@ discard block |
||
| 571 | 571 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null) |
| 572 | 572 | */ |
| 573 | 573 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
| 574 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
| 575 | - return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
| 574 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
| 575 | + return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
| 576 | 576 | } |
| 577 | 577 | |
| 578 | 578 | /** |
@@ -50,8 +50,9 @@ discard block |
||
| 50 | 50 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
| 51 | 51 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback)."});\n"; |
| 52 | 52 | $retour=$this->_addJsCondition($jsCondition,$retour); |
| 53 | - if ($immediatly) |
|
| 54 | - $this->jquery_code_for_compile[]=$retour; |
|
| 53 | + if ($immediatly) { |
|
| 54 | + $this->jquery_code_for_compile[]=$retour; |
|
| 55 | + } |
|
| 55 | 56 | return $retour; |
| 56 | 57 | } |
| 57 | 58 | |
@@ -87,12 +88,13 @@ discard block |
||
| 87 | 88 | if(JString::isNotNull($attr)){ |
| 88 | 89 | if ($attr==="value"){ |
| 89 | 90 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
| 90 | - }elseif ($attr==="html"){ |
|
| 91 | + } elseif ($attr==="html"){ |
|
| 91 | 92 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
| 92 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
| 93 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
| 93 | 94 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
| 94 | - }elseif($attr!==null && $attr!=="") |
|
| 95 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 95 | + } elseif($attr!==null && $attr!=="") { |
|
| 96 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 97 | + } |
|
| 96 | 98 | } |
| 97 | 99 | return $retour; |
| 98 | 100 | } |
@@ -102,13 +104,14 @@ discard block |
||
| 102 | 104 | if (JString::isNotNull($responseElement)) { |
| 103 | 105 | if(isset($ajaxTransition)){ |
| 104 | 106 | $call=$this->setAjaxDataCall($ajaxTransition); |
| 105 | - }elseif(isset($this->ajaxTransition)){ |
|
| 107 | + } elseif(isset($this->ajaxTransition)){ |
|
| 106 | 108 | $call=$this->ajaxTransition; |
| 107 | 109 | } |
| 108 | - if(\is_callable($call)) |
|
| 109 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 110 | - else |
|
| 111 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 110 | + if(\is_callable($call)) { |
|
| 111 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
| 112 | + } else { |
|
| 113 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 114 | + } |
|
| 112 | 115 | } |
| 113 | 116 | $retour.="\t".$jsCallback."\n"; |
| 114 | 117 | return $retour; |
@@ -123,8 +126,9 @@ discard block |
||
| 123 | 126 | } |
| 124 | 127 | |
| 125 | 128 | protected function _correctAjaxUrl($url) { |
| 126 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 127 | - $url=substr($url, 0, strlen($url)-1); |
|
| 129 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
| 130 | + $url=substr($url, 0, strlen($url)-1); |
|
| 131 | + } |
|
| 128 | 132 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
| 129 | 133 | $url=$this->getUrl($url); |
| 130 | 134 | } |
@@ -144,8 +148,9 @@ discard block |
||
| 144 | 148 | public static function _implodeParams($parameters){ |
| 145 | 149 | $allParameters=[]; |
| 146 | 150 | foreach ($parameters as $params){ |
| 147 | - if(isset($params)) |
|
| 148 | - $allParameters[]=self::_correctParams($params); |
|
| 151 | + if(isset($params)) { |
|
| 152 | + $allParameters[]=self::_correctParams($params); |
|
| 153 | + } |
|
| 149 | 154 | } |
| 150 | 155 | return \implode("+'&'+", $allParameters); |
| 151 | 156 | } |
@@ -174,8 +179,9 @@ discard block |
||
| 174 | 179 | |
| 175 | 180 | protected function setDefaultParameters(&$parameters,$default){ |
| 176 | 181 | foreach ($default as $k=>$v){ |
| 177 | - if(!isset($parameters[$k])) |
|
| 178 | - $parameters[$k]=$v; |
|
| 182 | + if(!isset($parameters[$k])) { |
|
| 183 | + $parameters[$k]=$v; |
|
| 184 | + } |
|
| 179 | 185 | } |
| 180 | 186 | } |
| 181 | 187 | |
@@ -246,8 +252,9 @@ discard block |
||
| 246 | 252 | $retour.="\t".$jsCallback."\n". |
| 247 | 253 | "\t$(document).trigger('jsonReady',[data]);\n". |
| 248 | 254 | "});\n"; |
| 249 | - if ($immediatly) |
|
| 250 | - $this->jquery_code_for_compile[]=$retour; |
|
| 255 | + if ($immediatly) { |
|
| 256 | + $this->jquery_code_for_compile[]=$retour; |
|
| 257 | + } |
|
| 251 | 258 | return $retour; |
| 252 | 259 | } |
| 253 | 260 | |
@@ -312,7 +319,7 @@ discard block |
||
| 312 | 319 | if($context===null){ |
| 313 | 320 | $parent="$('".$maskSelector."').parent()"; |
| 314 | 321 | $newElm = "$('#'+newId)"; |
| 315 | - }else{ |
|
| 322 | + } else{ |
|
| 316 | 323 | $parent=$context; |
| 317 | 324 | $newElm = $context.".find('#'+newId)"; |
| 318 | 325 | } |
@@ -325,8 +332,9 @@ discard block |
||
| 325 | 332 | $retour.="\t}\n"."\tfor(var key in value){\n"."\t\t\tvar html = $('<div />').append($(newElm).clone()).html();\n"."\t\t\tif(html.indexOf('__'+key+'__')>-1){\n"."\t\t\t\tcontent=$(html.split('__'+key+'__').join(value[key]));\n"."\t\t\t\t$(newElm).replaceWith(content);newElm=content;\n"."\t\t\t}\n"."\t\tvar sel='[data-id=\"'+key+'\"]';if($(sel,newElm).length){\n"."\t\t\tvar selElm=$(sel,newElm);\n"."\t\t\t if(selElm.is('[value]')) { selElm.attr('value',value[key]);selElm.val(value[key]);} else { selElm.html(value[key]); }\n"."\t\t}\n"."}\n"."\t$(newElm).show(true);"."\n"."\t$(newElm).removeClass('hide');"."});\n"; |
| 326 | 333 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
| 327 | 334 | $retour.="\t".$jsCallback."\n"."});\n"; |
| 328 | - if ($immediatly) |
|
| 329 | - $this->jquery_code_for_compile[]=$retour; |
|
| 335 | + if ($immediatly) { |
|
| 336 | + $this->jquery_code_for_compile[]=$retour; |
|
| 337 | + } |
|
| 330 | 338 | return $retour; |
| 331 | 339 | } |
| 332 | 340 | |
@@ -530,8 +538,9 @@ discard block |
||
| 530 | 538 | $retour.="$('#".$form."').submit();\n"; |
| 531 | 539 | } |
| 532 | 540 | $retour=$this->_addJsCondition($jsCondition, $retour); |
| 533 | - if ($immediatly) |
|
| 534 | - $this->jquery_code_for_compile[]=$retour; |
|
| 541 | + if ($immediatly) { |
|
| 542 | + $this->jquery_code_for_compile[]=$retour; |
|
| 543 | + } |
|
| 535 | 544 | return $retour; |
| 536 | 545 | } |
| 537 | 546 | |
@@ -11,11 +11,11 @@ discard block |
||
| 11 | 11 | trait JsUtilsEventsTrait { |
| 12 | 12 | |
| 13 | 13 | |
| 14 | - protected $jquery_events=array ( |
|
| 15 | - "bind","blur","change","click","dblclick","delegate","die","error","focus","focusin","focusout","hover","keydown","keypress","keyup","live","load","mousedown","mousseenter","mouseleave","mousemove","mouseout","mouseover","mouseup","off","on","one","ready","resize","scroll","select","submit","toggle","trigger","triggerHandler","undind","undelegate","unload" |
|
| 14 | + protected $jquery_events=array( |
|
| 15 | + "bind", "blur", "change", "click", "dblclick", "delegate", "die", "error", "focus", "focusin", "focusout", "hover", "keydown", "keypress", "keyup", "live", "load", "mousedown", "mousseenter", "mouseleave", "mousemove", "mouseout", "mouseover", "mouseup", "off", "on", "one", "ready", "resize", "scroll", "select", "submit", "toggle", "trigger", "triggerHandler", "undind", "undelegate", "unload" |
|
| 16 | 16 | ); |
| 17 | 17 | |
| 18 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
| 18 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | 21 | * Outputs a javascript library blur event |
@@ -37,8 +37,8 @@ discard block |
||
| 37 | 37 | * @param boolean $stopPropagation |
| 38 | 38 | * @return string |
| 39 | 39 | */ |
| 40 | - public function change($element='this', $js='',$preventDefault=false,$stopPropagation=false) { |
|
| 41 | - return $this->_add_event($element, $js, 'change',$preventDefault,$stopPropagation); |
|
| 40 | + public function change($element='this', $js='', $preventDefault=false, $stopPropagation=false) { |
|
| 41 | + return $this->_add_event($element, $js, 'change', $preventDefault, $stopPropagation); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | /** |
@@ -51,9 +51,9 @@ discard block |
||
| 51 | 51 | * @param boolean $stopPropagation |
| 52 | 52 | * @return string |
| 53 | 53 | */ |
| 54 | - public function click($element='this', $js='', $ret_false=TRUE,$preventDefault=false,$stopPropagation=false) { |
|
| 54 | + public function click($element='this', $js='', $ret_false=TRUE, $preventDefault=false, $stopPropagation=false) { |
|
| 55 | 55 | if (!is_array($js)) { |
| 56 | - $js=array ( |
|
| 56 | + $js=array( |
|
| 57 | 57 | $js |
| 58 | 58 | ); |
| 59 | 59 | } |
@@ -62,7 +62,7 @@ discard block |
||
| 62 | 62 | $js[]="return false;"; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | - return $this->_add_event($element, $js, 'click',$preventDefault,$stopPropagation); |
|
| 65 | + return $this->_add_event($element, $js, 'click', $preventDefault, $stopPropagation); |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | /** |
