phpMv /
phpMv-UI
@@ -28,8 +28,8 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | public function __construct($autoCompile=true) { |
| 30 | 30 | $this->autoCompile=$autoCompile; |
| 31 | - $this->components=array (); |
|
| 32 | - $this->htmlComponents=array (); |
|
| 31 | + $this->components=array(); |
|
| 32 | + $this->htmlComponents=array(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function isAutoCompile() { |
@@ -42,9 +42,9 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | public function compile($internal=false) { |
| 45 | - if ($internal===false&&$this->autoCompile===true) |
|
| 45 | + if ($internal===false && $this->autoCompile===true) |
|
| 46 | 46 | throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
| 47 | - foreach ( $this->components as $component ) { |
|
| 47 | + foreach ($this->components as $component) { |
|
| 48 | 48 | $component->compile(); |
| 49 | 49 | } |
| 50 | 50 | } |
@@ -54,13 +54,13 @@ discard block |
||
| 54 | 54 | } |
| 55 | 55 | |
| 56 | 56 | public function addComponent(SimpleComponent $component, $attachTo, $params) { |
| 57 | - if ($this->autoCompile){ |
|
| 58 | - if($attachTo!=null){ |
|
| 59 | - if(!isset($this->components [$attachTo])){ |
|
| 57 | + if ($this->autoCompile) { |
|
| 58 | + if ($attachTo!=null) { |
|
| 59 | + if (!isset($this->components [$attachTo])) { |
|
| 60 | 60 | $this->components [$attachTo]=$component; |
| 61 | 61 | } |
| 62 | 62 | $component->attach($attachTo); |
| 63 | - }else{ |
|
| 63 | + } else { |
|
| 64 | 64 | $this->components []=$component; |
| 65 | 65 | } |
| 66 | 66 | } |
@@ -76,12 +76,12 @@ discard block |
||
| 76 | 76 | } |
| 77 | 77 | |
| 78 | 78 | public function compileHtml(JsUtils $js=NULL, &$view=NULL) { |
| 79 | - foreach ( $this->htmlComponents as $htmlComponent ) { |
|
| 79 | + foreach ($this->htmlComponents as $htmlComponent) { |
|
| 80 | 80 | $htmlComponent->compile($js, $view); |
| 81 | 81 | } |
| 82 | 82 | } |
| 83 | 83 | |
| 84 | - public function matchHtmlComponents($callback){ |
|
| 85 | - return array_filter($this->htmlComponents,$callback); |
|
| 84 | + public function matchHtmlComponents($callback) { |
|
| 85 | + return array_filter($this->htmlComponents, $callback); |
|
| 86 | 86 | } |
| 87 | 87 | } |
@@ -42,8 +42,9 @@ discard block |
||
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | public function compile($internal=false) { |
| 45 | - if ($internal===false&&$this->autoCompile===true) |
|
| 46 | - throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
| 45 | + if ($internal===false&&$this->autoCompile===true) { |
|
| 46 | + throw new \Exception("Impossible to compile if autoCompile is set to 'true'"); |
|
| 47 | + } |
|
| 47 | 48 | foreach ( $this->components as $component ) { |
| 48 | 49 | $component->compile(); |
| 49 | 50 | } |
@@ -60,13 +61,14 @@ discard block |
||
| 60 | 61 | $this->components [$attachTo]=$component; |
| 61 | 62 | } |
| 62 | 63 | $component->attach($attachTo); |
| 63 | - }else{ |
|
| 64 | + } else{ |
|
| 64 | 65 | $this->components []=$component; |
| 65 | 66 | } |
| 66 | 67 | } |
| 67 | - if (isset($params)) |
|
| 68 | - if (\is_array($params)) |
|
| 68 | + if (isset($params)) { |
|
| 69 | + if (\is_array($params)) |
|
| 69 | 70 | $component->setParams($params); |
| 71 | + } |
|
| 70 | 72 | return $component; |
| 71 | 73 | } |
| 72 | 74 | |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | */ |
| 24 | 24 | class HtmlForm extends HtmlSemCollection { |
| 25 | 25 | |
| 26 | - use FieldsTrait,FormTrait; |
|
| 26 | + use FieldsTrait, FormTrait; |
|
| 27 | 27 | /** |
| 28 | 28 | * @var array |
| 29 | 29 | */ |
@@ -38,15 +38,15 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | public function __construct($identifier, $elements=array()) { |
| 40 | 40 | parent::__construct($identifier, "form", "ui form"); |
| 41 | - $this->_states=[ State::ERROR,State::SUCCESS,State::WARNING,State::DISABLED ]; |
|
| 41 | + $this->_states=[State::ERROR, State::SUCCESS, State::WARNING, State::DISABLED]; |
|
| 42 | 42 | $this->setProperty("name", $this->identifier); |
| 43 | - $this->_fields=array (); |
|
| 43 | + $this->_fields=array(); |
|
| 44 | 44 | $this->addItems($elements); |
| 45 | 45 | $this->_validationParams=[]; |
| 46 | 46 | $this->_extraFieldRules=[]; |
| 47 | 47 | } |
| 48 | 48 | |
| 49 | - protected function getForm(){ |
|
| 49 | + protected function getForm() { |
|
| 50 | 50 | return $this; |
| 51 | 51 | } |
| 52 | 52 | |
@@ -68,8 +68,8 @@ discard block |
||
| 68 | 68 | * @param string $caption |
| 69 | 69 | * @return HtmlForm |
| 70 | 70 | */ |
| 71 | - public function addDivider($caption=NULL){ |
|
| 72 | - return $this->addContent(new HtmlDivider("",$caption)); |
|
| 71 | + public function addDivider($caption=NULL) { |
|
| 72 | + return $this->addContent(new HtmlDivider("", $caption)); |
|
| 73 | 73 | } |
| 74 | 74 | |
| 75 | 75 | /** |
@@ -91,13 +91,13 @@ discard block |
||
| 91 | 91 | $label=NULL; |
| 92 | 92 | } |
| 93 | 93 | $this->_fields=\array_merge($this->_fields, $fields); |
| 94 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
|
| 94 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count(), $fields); |
|
| 95 | 95 | } |
| 96 | - if (isset($label)){ |
|
| 97 | - $fields->wrap("<div class='field'><label>{$label}</label>","</div>"); |
|
| 96 | + if (isset($label)) { |
|
| 97 | + $fields->wrap("<div class='field'><label>{$label}</label>", "</div>"); |
|
| 98 | 98 | } |
| 99 | 99 | } else { |
| 100 | - $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count()); |
|
| 100 | + $fields=new HtmlFormFields("fields-".$this->identifier."-".$this->count()); |
|
| 101 | 101 | } |
| 102 | 102 | $this->addItem($fields); |
| 103 | 103 | return $fields; |
@@ -105,7 +105,7 @@ discard block |
||
| 105 | 105 | |
| 106 | 106 | public function addItem($item) { |
| 107 | 107 | $item=parent::addItem($item); |
| 108 | - if (\is_subclass_of($item, HtmlFormField::class) === true) { |
|
| 108 | + if (\is_subclass_of($item, HtmlFormField::class)===true) { |
|
| 109 | 109 | $this->_fields[]=$item; |
| 110 | 110 | } |
| 111 | 111 | return $item; |
@@ -163,49 +163,49 @@ discard block |
||
| 163 | 163 | |
| 164 | 164 | |
| 165 | 165 | |
| 166 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
| 167 | - if(\sizeof($this->_validationParams)>0) |
|
| 166 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
| 167 | + if (\sizeof($this->_validationParams)>0) |
|
| 168 | 168 | $this->setProperty("novalidate", ""); |
| 169 | - return parent::compile($js,$view); |
|
| 169 | + return parent::compile($js, $view); |
|
| 170 | 170 | } |
| 171 | 171 | |
| 172 | 172 | public function run(JsUtils $js) { |
| 173 | - if(isset($js)){ |
|
| 173 | + if (isset($js)) { |
|
| 174 | 174 | $compo=$js->semantic()->form("#".$this->identifier); |
| 175 | - }else{ |
|
| 175 | + } else { |
|
| 176 | 176 | $compo=new Form(); |
| 177 | 177 | $compo->attach("#".$this->identifier); |
| 178 | 178 | } |
| 179 | - foreach ($this->_fields as $field){ |
|
| 180 | - if($field instanceof HtmlFormField){ |
|
| 179 | + foreach ($this->_fields as $field) { |
|
| 180 | + if ($field instanceof HtmlFormField) { |
|
| 181 | 181 | $this->addCompoValidation($compo, $field); |
| 182 | 182 | } |
| 183 | 183 | } |
| 184 | - foreach ($this->content as $field){ |
|
| 185 | - if($field instanceof HtmlFormFields){ |
|
| 184 | + foreach ($this->content as $field) { |
|
| 185 | + if ($field instanceof HtmlFormFields) { |
|
| 186 | 186 | $items=$field->getItems(); |
| 187 | - foreach ($items as $_field){ |
|
| 188 | - if($_field instanceof HtmlFormField) |
|
| 187 | + foreach ($items as $_field) { |
|
| 188 | + if ($_field instanceof HtmlFormField) |
|
| 189 | 189 | $this->addCompoValidation($compo, $_field); |
| 190 | 190 | } |
| 191 | 191 | } |
| 192 | 192 | } |
| 193 | - foreach ($this->_extraFieldRules as $field=>$fieldValidation){ |
|
| 193 | + foreach ($this->_extraFieldRules as $field=>$fieldValidation) { |
|
| 194 | 194 | $this->addExtraCompoValidation($compo, $fieldValidation); |
| 195 | 195 | } |
| 196 | - $this->_runValidationParams($compo,$js); |
|
| 196 | + $this->_runValidationParams($compo, $js); |
|
| 197 | 197 | return $this->_bsComponent; |
| 198 | 198 | } |
| 199 | 199 | |
| 200 | - public function getExtraFieldValidation($fieldname){ |
|
| 201 | - if(!isset($this->_extraFieldRules[$fieldname])){ |
|
| 200 | + public function getExtraFieldValidation($fieldname) { |
|
| 201 | + if (!isset($this->_extraFieldRules[$fieldname])) { |
|
| 202 | 202 | $this->_extraFieldRules[$fieldname]=new FieldValidation($fieldname); |
| 203 | 203 | } |
| 204 | 204 | return $this->_extraFieldRules[$fieldname]; |
| 205 | 205 | } |
| 206 | 206 | |
| 207 | - public function addValidationParam($paramName,$paramValue,$before="",$after=""){ |
|
| 208 | - $this->addBehavior($this->_validationParams, $paramName, $paramValue,$before,$after); |
|
| 207 | + public function addValidationParam($paramName, $paramValue, $before="", $after="") { |
|
| 208 | + $this->addBehavior($this->_validationParams, $paramName, $paramValue, $before, $after); |
|
| 209 | 209 | return $this; |
| 210 | 210 | } |
| 211 | 211 | |
@@ -214,7 +214,7 @@ discard block |
||
| 214 | 214 | return $this; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | - public function hasValidationParams(){ |
|
| 217 | + public function hasValidationParams() { |
|
| 218 | 218 | return sizeof($this->_validationParams)>0; |
| 219 | 219 | } |
| 220 | 220 | |
@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | return $this->_validationParams; |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | - public function removeValidationParam($param){ |
|
| 225 | + public function removeValidationParam($param) { |
|
| 226 | 226 | unset($this->_validationParams[$param]); |
| 227 | 227 | return $this; |
| 228 | 228 | } |
@@ -58,8 +58,9 @@ discard block |
||
| 58 | 58 | */ |
| 59 | 59 | public function addHeader($title, $niveau=1, $dividing=true) { |
| 60 | 60 | $header=new HtmlHeader("", $niveau, $title); |
| 61 | - if ($dividing) |
|
| 62 | - $header->setDividing(); |
|
| 61 | + if ($dividing) { |
|
| 62 | + $header->setDividing(); |
|
| 63 | + } |
|
| 63 | 64 | return $this->addItem($header); |
| 64 | 65 | } |
| 65 | 66 | |
@@ -87,8 +88,9 @@ discard block |
||
| 87 | 88 | if (\is_string($end)) { |
| 88 | 89 | $label=$end; |
| 89 | 90 | \array_pop($fields); |
| 90 | - } else |
|
| 91 | - $label=NULL; |
|
| 91 | + } else { |
|
| 92 | + $label=NULL; |
|
| 93 | + } |
|
| 92 | 94 | } |
| 93 | 95 | $this->_fields=\array_merge($this->_fields, $fields); |
| 94 | 96 | $fields=new HtmlFormFields("fields-" . $this->identifier . "-" . $this->count(), $fields); |
@@ -152,27 +154,31 @@ discard block |
||
| 152 | 154 | */ |
| 153 | 155 | public function addMessage($identifier, $content, $header=NULL, $icon=NULL, $type=NULL) { |
| 154 | 156 | $message=new HtmlMessage($identifier, $content); |
| 155 | - if (isset($header)) |
|
| 156 | - $message->addHeader($header); |
|
| 157 | - if (isset($icon)) |
|
| 158 | - $message->setIcon($icon); |
|
| 159 | - if (isset($type)) |
|
| 160 | - $message->setStyle($type); |
|
| 157 | + if (isset($header)) { |
|
| 158 | + $message->addHeader($header); |
|
| 159 | + } |
|
| 160 | + if (isset($icon)) { |
|
| 161 | + $message->setIcon($icon); |
|
| 162 | + } |
|
| 163 | + if (isset($type)) { |
|
| 164 | + $message->setStyle($type); |
|
| 165 | + } |
|
| 161 | 166 | return $this->addItem($message); |
| 162 | 167 | } |
| 163 | 168 | |
| 164 | 169 | |
| 165 | 170 | |
| 166 | 171 | public function compile(JsUtils $js=NULL,&$view=NULL){ |
| 167 | - if(\sizeof($this->_validationParams)>0) |
|
| 168 | - $this->setProperty("novalidate", ""); |
|
| 172 | + if(\sizeof($this->_validationParams)>0) { |
|
| 173 | + $this->setProperty("novalidate", ""); |
|
| 174 | + } |
|
| 169 | 175 | return parent::compile($js,$view); |
| 170 | 176 | } |
| 171 | 177 | |
| 172 | 178 | public function run(JsUtils $js) { |
| 173 | 179 | if(isset($js)){ |
| 174 | 180 | $compo=$js->semantic()->form("#".$this->identifier); |
| 175 | - }else{ |
|
| 181 | + } else{ |
|
| 176 | 182 | $compo=new Form(); |
| 177 | 183 | $compo->attach("#".$this->identifier); |
| 178 | 184 | } |
@@ -185,8 +191,9 @@ discard block |
||
| 185 | 191 | if($field instanceof HtmlFormFields){ |
| 186 | 192 | $items=$field->getItems(); |
| 187 | 193 | foreach ($items as $_field){ |
| 188 | - if($_field instanceof HtmlFormField) |
|
| 189 | - $this->addCompoValidation($compo, $_field); |
|
| 194 | + if($_field instanceof HtmlFormField) { |
|
| 195 | + $this->addCompoValidation($compo, $_field); |
|
| 196 | + } |
|
| 190 | 197 | } |
| 191 | 198 | } |
| 192 | 199 | } |
@@ -15,15 +15,15 @@ discard block |
||
| 15 | 15 | * @author jc |
| 16 | 16 | * @version 1.02 |
| 17 | 17 | */ |
| 18 | -class HtmlTab extends HtmlSemCollection{ |
|
| 18 | +class HtmlTab extends HtmlSemCollection { |
|
| 19 | 19 | |
| 20 | 20 | protected $params=[]; |
| 21 | 21 | protected $_activated=false; |
| 22 | 22 | |
| 23 | - public function __construct( $identifier, $tabs=array()){ |
|
| 24 | - parent::__construct( $identifier, "div", ""); |
|
| 23 | + public function __construct($identifier, $tabs=array()) { |
|
| 24 | + parent::__construct($identifier, "div", ""); |
|
| 25 | 25 | $menu=new HtmlMenu("menu".$this->identifier); |
| 26 | - $menu->asTab(false)->setAttachment(NULL,Side::TOP); |
|
| 26 | + $menu->asTab(false)->setAttachment(NULL, Side::TOP); |
|
| 27 | 27 | $this->content["menu"]=$menu; |
| 28 | 28 | $this->addItems($tabs); |
| 29 | 29 | } |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | * @see \Ajax\common\html\HtmlCollection::createItem() |
| 34 | 34 | * @return HtmlSegment |
| 35 | 35 | */ |
| 36 | - protected function createItem($value){ |
|
| 36 | + protected function createItem($value) { |
|
| 37 | 37 | $count=$this->count(); |
| 38 | 38 | $title=$value; |
| 39 | 39 | $content=NULL; |
| 40 | - if(\is_array($value)){ |
|
| 41 | - $title=@$value[0];$content=@$value[1]; |
|
| 40 | + if (\is_array($value)) { |
|
| 41 | + $title=@$value[0]; $content=@$value[1]; |
|
| 42 | 42 | } |
| 43 | 43 | $menuItem=$this->content["menu"]->addItem($title); |
| 44 | 44 | $menuItem->addToProperty("data-tab", $menuItem->getIdentifier()); |
@@ -54,9 +54,9 @@ discard block |
||
| 54 | 54 | * @param string $datatab |
| 55 | 55 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 56 | 56 | */ |
| 57 | - private function createSegment($count,$content,$datatab){ |
|
| 57 | + private function createSegment($count, $content, $datatab) { |
|
| 58 | 58 | $segment=new HtmlSegment("item-".$this->identifier."-".$count, $content); |
| 59 | - $segment->setAttachment(NULL,Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab",$datatab); |
|
| 59 | + $segment->setAttachment(NULL, Side::BOTTOM)->addToProperty("class", "tab")->addToProperty("data-tab", $datatab); |
|
| 60 | 60 | return $segment; |
| 61 | 61 | } |
| 62 | 62 | |
@@ -66,12 +66,12 @@ discard block |
||
| 66 | 66 | * @param String $content new content |
| 67 | 67 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 68 | 68 | */ |
| 69 | - public function setTabContent($index,$content){ |
|
| 69 | + public function setTabContent($index, $content) { |
|
| 70 | 70 | $menu=$this->content["menu"]; |
| 71 | - if($index<$menu->count()){ |
|
| 72 | - if(isset($this->content[$index])===false){ |
|
| 71 | + if ($index<$menu->count()) { |
|
| 72 | + if (isset($this->content[$index])===false) { |
|
| 73 | 73 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
| 74 | - }else |
|
| 74 | + } else |
|
| 75 | 75 | $this->content[$index]->setContent($content); |
| 76 | 76 | } |
| 77 | 77 | return $this; |
@@ -82,9 +82,9 @@ discard block |
||
| 82 | 82 | * @param array $contents |
| 83 | 83 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 84 | 84 | */ |
| 85 | - public function setTabsContent($contents){ |
|
| 85 | + public function setTabsContent($contents) { |
|
| 86 | 86 | $size=\sizeof($contents); |
| 87 | - for($i=0;$i<$size;$i++){ |
|
| 87 | + for ($i=0; $i<$size; $i++) { |
|
| 88 | 88 | $this->setTabContent($i, $contents[$i]); |
| 89 | 89 | } |
| 90 | 90 | return $this; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | * @param int $index |
| 96 | 96 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 97 | 97 | */ |
| 98 | - public function activate($index){ |
|
| 98 | + public function activate($index) { |
|
| 99 | 99 | $this->content["menu"]->getItem($index)->setActive(true); |
| 100 | 100 | $this->content[$index]->setActive(true); |
| 101 | 101 | $this->_activated=true; |
@@ -108,8 +108,8 @@ discard block |
||
| 108 | 108 | * @param string $content |
| 109 | 109 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 110 | 110 | */ |
| 111 | - public function addTab($title,$content){ |
|
| 112 | - return $this->addItem([$title,$content]); |
|
| 111 | + public function addTab($title, $content) { |
|
| 112 | + return $this->addItem([$title, $content]); |
|
| 113 | 113 | } |
| 114 | 114 | |
| 115 | 115 | /** |
@@ -123,13 +123,13 @@ discard block |
||
| 123 | 123 | * @param array $params |
| 124 | 124 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 125 | 125 | */ |
| 126 | - public function forwardTab($index,JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
| 127 | - if(\array_key_exists($index, $this->content)){ |
|
| 128 | - $this->content[$index]=$js->forward($initialController, $controller, $action,$params); |
|
| 126 | + public function forwardTab($index, JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
| 127 | + if (\array_key_exists($index, $this->content)) { |
|
| 128 | + $this->content[$index]=$js->forward($initialController, $controller, $action, $params); |
|
| 129 | 129 | return $this->content[$index]; |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | - return $this->addAndForwardTab($js, $title, $initialController, $controller, $action,$params); |
|
| 132 | + return $this->addAndForwardTab($js, $title, $initialController, $controller, $action, $params); |
|
| 133 | 133 | } |
| 134 | 134 | |
| 135 | 135 | /** |
@@ -142,12 +142,12 @@ discard block |
||
| 142 | 142 | * @param array $params The parameters to pass to the view |
| 143 | 143 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 144 | 144 | */ |
| 145 | - public function renderViewTab($index,JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
| 146 | - if(\array_key_exists($index, $this->content)){ |
|
| 147 | - $this->content[$index]=$js->renderContent($initialController, $viewName,$params); |
|
| 145 | + public function renderViewTab($index, JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
| 146 | + if (\array_key_exists($index, $this->content)) { |
|
| 147 | + $this->content[$index]=$js->renderContent($initialController, $viewName, $params); |
|
| 148 | 148 | return $this->content[$index]; |
| 149 | 149 | } |
| 150 | - return $this->addAndRenderViewTab($js, $title, $initialController, $viewName,$params); |
|
| 150 | + return $this->addAndRenderViewTab($js, $title, $initialController, $viewName, $params); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -161,11 +161,11 @@ discard block |
||
| 161 | 161 | * @param array $params |
| 162 | 162 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 163 | 163 | */ |
| 164 | - public function addAndForwardTab(JsUtils $js,$title,$initialController,$controller,$action,$params=array()){ |
|
| 164 | + public function addAndForwardTab(JsUtils $js, $title, $initialController, $controller, $action, $params=array()) { |
|
| 165 | 165 | \ob_start(); |
| 166 | - $js->forward($initialController, $controller, $action,$params); |
|
| 166 | + $js->forward($initialController, $controller, $action, $params); |
|
| 167 | 167 | $content=\ob_get_clean(); |
| 168 | - return $this->addTab($title,$content); |
|
| 168 | + return $this->addTab($title, $content); |
|
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | /** |
@@ -177,8 +177,8 @@ discard block |
||
| 177 | 177 | * @param array $params The parameters to pass to the view |
| 178 | 178 | * @return \Ajax\semantic\html\elements\HtmlSegment |
| 179 | 179 | */ |
| 180 | - public function addAndRenderViewTab(JsUtils $js,$title,$initialController, $viewName, $params=array()) { |
|
| 181 | - return $this->addTab($title, $js->renderContent($initialController, $viewName,$params)); |
|
| 180 | + public function addAndRenderViewTab(JsUtils $js, $title, $initialController, $viewName, $params=array()) { |
|
| 181 | + return $this->addTab($title, $js->renderContent($initialController, $viewName, $params)); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | public function setPointing($value=Direction::NONE) { |
@@ -194,7 +194,7 @@ discard block |
||
| 194 | 194 | * @param int $index |
| 195 | 195 | * @return HtmlMenuItem |
| 196 | 196 | */ |
| 197 | - public function getMenuTab($index){ |
|
| 197 | + public function getMenuTab($index) { |
|
| 198 | 198 | return $this->content["menu"]->getItem($index); |
| 199 | 199 | } |
| 200 | 200 | |
@@ -203,7 +203,7 @@ discard block |
||
| 203 | 203 | * @param int $index |
| 204 | 204 | * @return HtmlSegment |
| 205 | 205 | */ |
| 206 | - public function getTab($index){ |
|
| 206 | + public function getTab($index) { |
|
| 207 | 207 | return $this->content[$index]; |
| 208 | 208 | } |
| 209 | 209 | |
@@ -212,22 +212,22 @@ discard block |
||
| 212 | 212 | * @param HtmlMenu $menu |
| 213 | 213 | * @return \Ajax\semantic\html\modules\HtmlTab |
| 214 | 214 | */ |
| 215 | - public function setMenu($menu){ |
|
| 215 | + public function setMenu($menu) { |
|
| 216 | 216 | $contentSize=\sizeof($this->content); |
| 217 | - for($i=0;$i<$contentSize;$i++){ |
|
| 218 | - if($menu->getItem($i)!==NULL){ |
|
| 219 | - if(isset($this->content[$i])){ |
|
| 220 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
| 217 | + for ($i=0; $i<$contentSize; $i++) { |
|
| 218 | + if ($menu->getItem($i)!==NULL) { |
|
| 219 | + if (isset($this->content[$i])) { |
|
| 220 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
| 221 | 221 | } |
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | $menuSize=$menu->count(); |
| 225 | - for($i=0;$i<$menuSize;$i++){ |
|
| 225 | + for ($i=0; $i<$menuSize; $i++) { |
|
| 226 | 226 | $menu->getItem($i)->removeProperty("href"); |
| 227 | - if(isset($this->content[$i])===false){ |
|
| 227 | + if (isset($this->content[$i])===false) { |
|
| 228 | 228 | $this->content[$i]=$this->createSegment($i, "New content", $menu->getItem($i)->getIdentifier()); |
| 229 | 229 | } |
| 230 | - $menu->getItem($i)->addToProperty("data-tab",$this->content[$i]->getProperty("data-tab")); |
|
| 230 | + $menu->getItem($i)->addToProperty("data-tab", $this->content[$i]->getProperty("data-tab")); |
|
| 231 | 231 | } |
| 232 | 232 | |
| 233 | 233 | $this->content["menu"]=$menu; |
@@ -239,15 +239,15 @@ discard block |
||
| 239 | 239 | * @see BaseHtml::run() |
| 240 | 240 | */ |
| 241 | 241 | public function run(JsUtils $js) { |
| 242 | - if(isset($this->_bsComponent)===false) |
|
| 243 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
| 242 | + if (isset($this->_bsComponent)===false) |
|
| 243 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item", $this->params); |
|
| 244 | 244 | $this->addEventsOnRun($js); |
| 245 | 245 | return $this->_bsComponent; |
| 246 | 246 | } |
| 247 | 247 | |
| 248 | 248 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 249 | - if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
| 249 | + if (!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
| 250 | 250 | $this->activate(0); |
| 251 | - return parent::compile($js,$view); |
|
| 251 | + return parent::compile($js, $view); |
|
| 252 | 252 | } |
| 253 | 253 | } |
@@ -71,8 +71,9 @@ discard block |
||
| 71 | 71 | if($index<$menu->count()){ |
| 72 | 72 | if(isset($this->content[$index])===false){ |
| 73 | 73 | $this->content[$index]=$this->createSegment($index, $content, $menu->getItem($index)->getIdentifier()); |
| 74 | - }else |
|
| 75 | - $this->content[$index]->setContent($content); |
|
| 74 | + } else { |
|
| 75 | + $this->content[$index]->setContent($content); |
|
| 76 | + } |
|
| 76 | 77 | } |
| 77 | 78 | return $this; |
| 78 | 79 | } |
@@ -239,15 +240,17 @@ discard block |
||
| 239 | 240 | * @see BaseHtml::run() |
| 240 | 241 | */ |
| 241 | 242 | public function run(JsUtils $js) { |
| 242 | - if(isset($this->_bsComponent)===false) |
|
| 243 | - $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
| 243 | + if(isset($this->_bsComponent)===false) { |
|
| 244 | + $this->_bsComponent=$js->semantic()->tab("#".$this->identifier." .item",$this->params); |
|
| 245 | + } |
|
| 244 | 246 | $this->addEventsOnRun($js); |
| 245 | 247 | return $this->_bsComponent; |
| 246 | 248 | } |
| 247 | 249 | |
| 248 | 250 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
| 249 | - if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) |
|
| 250 | - $this->activate(0); |
|
| 251 | + if(!$this->_activated && $this->content["menu"]->count()>0 && \sizeof($this->content)>1) { |
|
| 252 | + $this->activate(0); |
|
| 253 | + } |
|
| 251 | 254 | return parent::compile($js,$view); |
| 252 | 255 | } |
| 253 | 256 | } |
@@ -16,56 +16,56 @@ discard block |
||
| 16 | 16 | |
| 17 | 17 | protected $ajaxTransition; |
| 18 | 18 | |
| 19 | - protected $ajaxLoader = "<div class=\"ui active centered inline text loader\">Loading</div>"; |
|
| 19 | + protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>"; |
|
| 20 | 20 | |
| 21 | 21 | abstract public function getUrl($url); |
| 22 | 22 | |
| 23 | - abstract public function _add_event($element, $js, $event, $preventDefault = false, $stopPropagation = false, $immediatly = true); |
|
| 23 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
| 24 | 24 | |
| 25 | - abstract public function interval($jsCode, $time, $globalName = null, $immediatly = true); |
|
| 25 | + abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true); |
|
| 26 | 26 | |
| 27 | - protected function _ajax($method, $url, $responseElement = "", $parameters = []) { |
|
| 27 | + protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 28 | 28 | if (isset($this->params["ajax"])) { |
| 29 | 29 | extract($this->params["ajax"]); |
| 30 | 30 | } |
| 31 | 31 | extract($parameters); |
| 32 | 32 | |
| 33 | - $jsCallback = isset($jsCallback) ? $jsCallback : ""; |
|
| 34 | - $retour = $this->_getAjaxUrl($url, $attr); |
|
| 35 | - $originalSelector = $responseElement; |
|
| 36 | - $responseElement = $this->_getResponseElement($responseElement); |
|
| 37 | - $retour .= "var self=this;\n"; |
|
| 38 | - $before = isset($before) ? $before : ""; |
|
| 39 | - $retour .= $before; |
|
| 40 | - if ($hasLoader === true && JString::isNotNull($responseElement)) { |
|
| 33 | + $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
|
| 34 | + $retour=$this->_getAjaxUrl($url, $attr); |
|
| 35 | + $originalSelector=$responseElement; |
|
| 36 | + $responseElement=$this->_getResponseElement($responseElement); |
|
| 37 | + $retour.="var self=this;\n"; |
|
| 38 | + $before=isset($before) ? $before : ""; |
|
| 39 | + $retour.=$before; |
|
| 40 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
| 41 | 41 | $this->addLoading($retour, $responseElement, $ajaxLoader); |
| 42 | - } elseif ($hasLoader === "internal") { |
|
| 43 | - $retour .= "\n$(this).addClass('loading');"; |
|
| 42 | + } elseif ($hasLoader==="internal") { |
|
| 43 | + $retour.="\n$(this).addClass('loading');"; |
|
| 44 | 44 | } |
| 45 | - $ajaxParameters = [ |
|
| 45 | + $ajaxParameters=[ |
|
| 46 | 46 | "url" => "url", |
| 47 | - "method" => "'" . \strtoupper($method) . "'" |
|
| 47 | + "method" => "'".\strtoupper($method)."'" |
|
| 48 | 48 | ]; |
| 49 | 49 | |
| 50 | - $ajaxParameters["async"] = ($async ? "true" : "false"); |
|
| 50 | + $ajaxParameters["async"]=($async ? "true" : "false"); |
|
| 51 | 51 | |
| 52 | 52 | if (isset($params)) { |
| 53 | - $ajaxParameters["data"] = self::_correctParams($params, $parameters); |
|
| 53 | + $ajaxParameters["data"]=self::_correctParams($params, $parameters); |
|
| 54 | 54 | } |
| 55 | 55 | if (isset($headers)) { |
| 56 | - $ajaxParameters["headers"] = $headers; |
|
| 56 | + $ajaxParameters["headers"]=$headers; |
|
| 57 | 57 | } |
| 58 | 58 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 59 | - $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n"; |
|
| 60 | - $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
|
| 61 | - $retour = $this->_addJsCondition($jsCondition, $retour); |
|
| 59 | + $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
|
| 60 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\n"; |
|
| 61 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 62 | 62 | if ($immediatly) |
| 63 | - $this->jquery_code_for_compile[] = $retour; |
|
| 63 | + $this->jquery_code_for_compile[]=$retour; |
|
| 64 | 64 | return $retour; |
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | protected function createAjaxParameters(&$original, $parameters) { |
| 68 | - $validParameters = [ |
|
| 68 | + $validParameters=[ |
|
| 69 | 69 | "contentType" => "%value%", |
| 70 | 70 | "dataType" => "'%value%'", |
| 71 | 71 | "beforeSend" => "function(jqXHR,settings){%value%}", |
@@ -73,21 +73,21 @@ discard block |
||
| 73 | 73 | ]; |
| 74 | 74 | foreach ($validParameters as $param => $mask) { |
| 75 | 75 | if (isset($parameters[$param])) { |
| 76 | - $original[$param] = \str_replace("%value%", $parameters[$param], $mask); |
|
| 76 | + $original[$param]=\str_replace("%value%", $parameters[$param], $mask); |
|
| 77 | 77 | } |
| 78 | 78 | } |
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | protected function implodeAjaxParameters($ajaxParameters) { |
| 82 | - $s = ''; |
|
| 82 | + $s=''; |
|
| 83 | 83 | foreach ($ajaxParameters as $k => $v) { |
| 84 | - if ($s !== '') { |
|
| 85 | - $s .= ','; |
|
| 84 | + if ($s!=='') { |
|
| 85 | + $s.=','; |
|
| 86 | 86 | } |
| 87 | 87 | if (is_array($v)) { |
| 88 | - $s .= "'{$k}':{" . self::implodeAjaxParameters($v) . "}"; |
|
| 88 | + $s.="'{$k}':{".self::implodeAjaxParameters($v)."}"; |
|
| 89 | 89 | } else { |
| 90 | - $s .= "'{$k}':{$v}"; |
|
| 90 | + $s.="'{$k}':{$v}"; |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | return $s; |
@@ -95,27 +95,27 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | protected function _addJsCondition($jsCondition, $jsSource) { |
| 97 | 97 | if (isset($jsCondition)) { |
| 98 | - return "if(" . $jsCondition . "){\n" . $jsSource . "\n}"; |
|
| 98 | + return "if(".$jsCondition."){\n".$jsSource."\n}"; |
|
| 99 | 99 | } |
| 100 | 100 | return $jsSource; |
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | protected function _getAjaxUrl($url, $attr) { |
| 104 | - $url = $this->_correctAjaxUrl($url); |
|
| 105 | - $retour = "url='" . $url . "';"; |
|
| 106 | - $slash = "/"; |
|
| 107 | - if (JString::endswith($url, "/") === true) { |
|
| 108 | - $slash = ""; |
|
| 104 | + $url=$this->_correctAjaxUrl($url); |
|
| 105 | + $retour="url='".$url."';"; |
|
| 106 | + $slash="/"; |
|
| 107 | + if (JString::endswith($url, "/")===true) { |
|
| 108 | + $slash=""; |
|
| 109 | 109 | } |
| 110 | 110 | if (JString::isNotNull($attr)) { |
| 111 | - if ($attr === "value") { |
|
| 112 | - $retour .= "url=url+'" . $slash . "'+$(this).val();\n"; |
|
| 113 | - } elseif ($attr === "html") { |
|
| 114 | - $retour .= "url=url+'" . $slash . "'+$(this).html();\n"; |
|
| 115 | - } elseif (\substr($attr, 0, 3) === "js:") { |
|
| 116 | - $retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n"; |
|
| 117 | - } elseif ($attr !== null && $attr !== "") |
|
| 118 | - $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 111 | + if ($attr==="value") { |
|
| 112 | + $retour.="url=url+'".$slash."'+$(this).val();\n"; |
|
| 113 | + } elseif ($attr==="html") { |
|
| 114 | + $retour.="url=url+'".$slash."'+$(this).html();\n"; |
|
| 115 | + } elseif (\substr($attr, 0, 3)==="js:") { |
|
| 116 | + $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
|
| 117 | + } elseif ($attr!==null && $attr!=="") |
|
| 118 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
| 119 | 119 | } |
| 120 | 120 | return $retour; |
| 121 | 121 | } |
@@ -124,91 +124,91 @@ discard block |
||
| 124 | 124 | return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};"; |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | - protected function autoActiveLinks($previousURL = "window.location.href") { |
|
| 128 | - $result = "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
| 129 | - $result .= "\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
|
| 127 | + protected function autoActiveLinks($previousURL="window.location.href") { |
|
| 128 | + $result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
| 129 | + $result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
|
| 130 | 130 | return $result; |
| 131 | 131 | } |
| 132 | 132 | |
| 133 | - protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader = false, $history = null) { |
|
| 134 | - $retour = ""; |
|
| 135 | - $call = null; |
|
| 133 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) { |
|
| 134 | + $retour=""; |
|
| 135 | + $call=null; |
|
| 136 | 136 | if (JString::isNotNull($responseElement)) { |
| 137 | 137 | if (isset($ajaxTransition)) { |
| 138 | - $call = $this->setAjaxDataCall($ajaxTransition); |
|
| 138 | + $call=$this->setAjaxDataCall($ajaxTransition); |
|
| 139 | 139 | } elseif (isset($this->ajaxTransition)) { |
| 140 | - $call = $this->ajaxTransition; |
|
| 140 | + $call=$this->ajaxTransition; |
|
| 141 | 141 | } |
| 142 | 142 | if (\is_callable($call)) |
| 143 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 143 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
| 144 | 144 | else |
| 145 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 145 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 146 | 146 | } |
| 147 | 147 | if (isset($history)) { |
| 148 | 148 | if ($this->params["autoActiveLinks"]) { |
| 149 | - $retour .= $this->autoActiveLinks("url"); |
|
| 149 | + $retour.=$this->autoActiveLinks("url"); |
|
| 150 | 150 | } |
| 151 | - $retour .= "\nwindow.history.pushState({'html':data,'selector':" . Javascript::prep_value($history) . ",'jqueryDone':'{$jqueryDone}'},'', url);"; |
|
| 151 | + $retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);"; |
|
| 152 | 152 | } |
| 153 | - if ($hasLoader === "internal") { |
|
| 154 | - $retour .= "\n$(self).removeClass('loading');"; |
|
| 153 | + if ($hasLoader==="internal") { |
|
| 154 | + $retour.="\n$(self).removeClass('loading');"; |
|
| 155 | 155 | } |
| 156 | - $retour .= "\t" . $jsCallback . "\n"; |
|
| 156 | + $retour.="\t".$jsCallback."\n"; |
|
| 157 | 157 | return $retour; |
| 158 | 158 | } |
| 159 | 159 | |
| 160 | 160 | protected function _getResponseElement($responseElement) { |
| 161 | 161 | if (JString::isNotNull($responseElement)) { |
| 162 | - $responseElement = Javascript::prep_jquery_selector($responseElement); |
|
| 162 | + $responseElement=Javascript::prep_jquery_selector($responseElement); |
|
| 163 | 163 | } |
| 164 | 164 | return $responseElement; |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | 167 | protected function _correctAjaxUrl($url) { |
| 168 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
| 169 | - $url = substr($url, 0, strlen($url) - 1); |
|
| 170 | - if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
|
| 171 | - $url = $this->getUrl($url); |
|
| 168 | + if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
| 169 | + $url=substr($url, 0, strlen($url)-1); |
|
| 170 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
| 171 | + $url=$this->getUrl($url); |
|
| 172 | 172 | } |
| 173 | 173 | return $url; |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | - public static function _correctParams($params, $ajaxParameters = []) { |
|
| 176 | + public static function _correctParams($params, $ajaxParameters=[]) { |
|
| 177 | 177 | if (JString::isNull($params)) { |
| 178 | 178 | return ""; |
| 179 | 179 | } |
| 180 | 180 | if (\preg_match("@^\{.*?\}$@", $params)) { |
| 181 | - if (! isset($ajaxParameters['contentType']) || ! UString::contains('json', $ajaxParameters['contentType'])) { |
|
| 182 | - return '$.param(' . $params . ')'; |
|
| 181 | + if (!isset($ajaxParameters['contentType']) || !UString::contains('json', $ajaxParameters['contentType'])) { |
|
| 182 | + return '$.param('.$params.')'; |
|
| 183 | 183 | } else { |
| 184 | - return 'JSON.stringify(' . $params . ')'; |
|
| 184 | + return 'JSON.stringify('.$params.')'; |
|
| 185 | 185 | } |
| 186 | 186 | } |
| 187 | 187 | return $params; |
| 188 | 188 | } |
| 189 | 189 | |
| 190 | 190 | public static function _implodeParams($parameters) { |
| 191 | - $allParameters = []; |
|
| 191 | + $allParameters=[]; |
|
| 192 | 192 | foreach ($parameters as $params) { |
| 193 | 193 | if (isset($params)) |
| 194 | - $allParameters[] = self::_correctParams($params); |
|
| 194 | + $allParameters[]=self::_correctParams($params); |
|
| 195 | 195 | } |
| 196 | 196 | return \implode("+'&'+", $allParameters); |
| 197 | 197 | } |
| 198 | 198 | |
| 199 | - protected function addLoading(&$retour, $responseElement, $ajaxLoader = null) { |
|
| 200 | - if (! isset($ajaxLoader)) { |
|
| 201 | - $ajaxLoader = $this->ajaxLoader; |
|
| 199 | + protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) { |
|
| 200 | + if (!isset($ajaxLoader)) { |
|
| 201 | + $ajaxLoader=$this->ajaxLoader; |
|
| 202 | 202 | } |
| 203 | - $loading_notifier = '<div class="ajax-loader">' . $ajaxLoader . '</div>'; |
|
| 204 | - $retour .= "{$responseElement}.empty();\n"; |
|
| 205 | - $retour .= "\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
|
| 203 | + $loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>'; |
|
| 204 | + $retour.="{$responseElement}.empty();\n"; |
|
| 205 | + $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
|
| 206 | 206 | } |
| 207 | 207 | |
| 208 | 208 | protected function setAjaxDataCall($params) { |
| 209 | - $result = null; |
|
| 210 | - if (! \is_callable($params)) { |
|
| 211 | - $result = function ($responseElement, $jqueryDone = "html") use ($params) { |
|
| 209 | + $result=null; |
|
| 210 | + if (!\is_callable($params)) { |
|
| 211 | + $result=function($responseElement, $jqueryDone="html") use ($params) { |
|
| 212 | 212 | return AjaxTransition::{$params}($responseElement, $jqueryDone); |
| 213 | 213 | }; |
| 214 | 214 | } |
@@ -217,13 +217,13 @@ discard block |
||
| 217 | 217 | |
| 218 | 218 | protected function setDefaultParameters(&$parameters, $default) { |
| 219 | 219 | foreach ($default as $k => $v) { |
| 220 | - if (! isset($parameters[$k])) |
|
| 221 | - $parameters[$k] = $v; |
|
| 220 | + if (!isset($parameters[$k])) |
|
| 221 | + $parameters[$k]=$v; |
|
| 222 | 222 | } |
| 223 | 223 | } |
| 224 | 224 | |
| 225 | 225 | public function setAjaxLoader($loader) { |
| 226 | - $this->ajaxLoader = $loader; |
|
| 226 | + $this->ajaxLoader=$loader; |
|
| 227 | 227 | } |
| 228 | 228 | |
| 229 | 229 | /** |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @param string $responseElement |
| 235 | 235 | * selector of the HTML element displaying the answer |
| 236 | 236 | */ |
| 237 | - private function _get($url, $responseElement = "", $parameters = []) { |
|
| 237 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
| 238 | 238 | return $this->_ajax("get", $url, $responseElement, $parameters); |
| 239 | 239 | } |
| 240 | 240 | |
@@ -248,8 +248,8 @@ discard block |
||
| 248 | 248 | * @param array $parameters |
| 249 | 249 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 250 | 250 | */ |
| 251 | - public function get($url, $responseElement = "", $parameters = []) { |
|
| 252 | - $parameters["immediatly"] = true; |
|
| 251 | + public function get($url, $responseElement="", $parameters=[]) { |
|
| 252 | + $parameters["immediatly"]=true; |
|
| 253 | 253 | return $this->_get($url, $responseElement, $parameters); |
| 254 | 254 | } |
| 255 | 255 | |
@@ -265,8 +265,8 @@ discard block |
||
| 265 | 265 | * @param array $parameters |
| 266 | 266 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 267 | 267 | */ |
| 268 | - public function ajax($method, $url, $responseElement = "", $parameters = []) { |
|
| 269 | - $parameters["immediatly"] = true; |
|
| 268 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
| 269 | + $parameters["immediatly"]=true; |
|
| 270 | 270 | return $this->_ajax($method, $url, $responseElement, $parameters); |
| 271 | 271 | } |
| 272 | 272 | |
@@ -286,7 +286,7 @@ discard block |
||
| 286 | 286 | * The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 287 | 287 | * @return string |
| 288 | 288 | */ |
| 289 | - public function ajaxInterval($method, $url, $interval, $globalName = null, $responseElement = "", $parameters = []) { |
|
| 289 | + public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) { |
|
| 290 | 290 | return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName); |
| 291 | 291 | } |
| 292 | 292 | |
@@ -302,8 +302,8 @@ discard block |
||
| 302 | 302 | * @param array $parameters |
| 303 | 303 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 304 | 304 | */ |
| 305 | - public function ajaxDeferred($method, $url, $responseElement = "", $parameters = []) { |
|
| 306 | - $parameters["immediatly"] = false; |
|
| 305 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
| 306 | + $parameters["immediatly"]=false; |
|
| 307 | 307 | return $this->_ajax($method, $url, $responseElement, $parameters); |
| 308 | 308 | } |
| 309 | 309 | |
@@ -317,15 +317,15 @@ discard block |
||
| 317 | 317 | * @param array $parameters |
| 318 | 318 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 319 | 319 | */ |
| 320 | - private function _json($url, $method = "get", $parameters = []) { |
|
| 321 | - $parameters = \array_merge($parameters, [ |
|
| 320 | + private function _json($url, $method="get", $parameters=[]) { |
|
| 321 | + $parameters=\array_merge($parameters, [ |
|
| 322 | 322 | "hasLoader" => false |
| 323 | 323 | ]); |
| 324 | - $jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 325 | - $context = isset($parameters['context']) ? $parameters['context'] : "document"; |
|
| 326 | - $retour = "\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t" . $jsCallback . ";" . "\n\tfor(var key in data){" . "if($('#'+key," . $context . ").length){ if($('#'+key," . $context . ").is('[value]')) { $('#'+key," . $context . ").val(data[key]);} else { $('#'+key," . $context . ").html(data[key]); }}};\n"; |
|
| 327 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 328 | - $parameters["jsCallback"] = $retour; |
|
| 324 | + $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 325 | + $context=isset($parameters['context']) ? $parameters['context'] : "document"; |
|
| 326 | + $retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";"."\n\tfor(var key in data){"."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
|
| 327 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 328 | + $parameters["jsCallback"]=$retour; |
|
| 329 | 329 | return $this->_ajax($method, $url, null, $parameters); |
| 330 | 330 | } |
| 331 | 331 | |
@@ -339,7 +339,7 @@ discard block |
||
| 339 | 339 | * @param array $parameters |
| 340 | 340 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 341 | 341 | */ |
| 342 | - public function json($url, $method = "get", $parameters = []) { |
|
| 342 | + public function json($url, $method="get", $parameters=[]) { |
|
| 343 | 343 | return $this->_json($url, $method, $parameters); |
| 344 | 344 | } |
| 345 | 345 | |
@@ -355,7 +355,7 @@ discard block |
||
| 355 | 355 | * @param array $parameters |
| 356 | 356 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
| 357 | 357 | */ |
| 358 | - public function jsonOn($event, $element, $url, $method = "get", $parameters = array()) { |
|
| 358 | + public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
| 359 | 359 | $this->setDefaultParameters($parameters, [ |
| 360 | 360 | "preventDefault" => true, |
| 361 | 361 | "stopPropagation" => true, |
@@ -374,8 +374,8 @@ discard block |
||
| 374 | 374 | * @param array $parameters |
| 375 | 375 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
| 376 | 376 | */ |
| 377 | - public function jsonDeferred($url, $method = "get", $parameters = []) { |
|
| 378 | - $parameters["immediatly"] = false; |
|
| 377 | + public function jsonDeferred($url, $method="get", $parameters=[]) { |
|
| 378 | + $parameters["immediatly"]=false; |
|
| 379 | 379 | return $this->_json($url, $method, $parameters); |
| 380 | 380 | } |
| 381 | 381 | |
@@ -390,29 +390,29 @@ discard block |
||
| 390 | 390 | * @param array $parameters |
| 391 | 391 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 392 | 392 | */ |
| 393 | - private function _jsonArray($maskSelector, $url, $method = "get", $parameters = []) { |
|
| 394 | - $parameters = \array_merge($parameters, [ |
|
| 393 | + private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
| 394 | + $parameters=\array_merge($parameters, [ |
|
| 395 | 395 | "hasLoader" => false |
| 396 | 396 | ]); |
| 397 | - $rowClass = isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
|
| 398 | - $jsCallback = isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 399 | - $context = isset($parameters['context']) ? $parameters['context'] : null; |
|
| 400 | - if ($context === null) { |
|
| 401 | - $parent = "$('" . $maskSelector . "').parent()"; |
|
| 402 | - $newElm = "$('#'+newId)"; |
|
| 397 | + $rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
|
| 398 | + $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
|
| 399 | + $context=isset($parameters['context']) ? $parameters['context'] : null; |
|
| 400 | + if ($context===null) { |
|
| 401 | + $parent="$('".$maskSelector."').parent()"; |
|
| 402 | + $newElm="$('#'+newId)"; |
|
| 403 | 403 | } else { |
| 404 | - $parent = $context; |
|
| 405 | - $newElm = $context . ".find('#'+newId)"; |
|
| 404 | + $parent=$context; |
|
| 405 | + $newElm=$context.".find('#'+newId)"; |
|
| 406 | 406 | } |
| 407 | - $appendTo = "\t\tnewElm.appendTo(" . $parent . ");\n"; |
|
| 408 | - $retour = $parent . ".find('.{$rowClass}').remove();"; |
|
| 409 | - $retour .= "\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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(); |
|
| 407 | + $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
|
| 408 | + $retour=$parent.".find('.{$rowClass}').remove();"; |
|
| 409 | + $retour.="\tdata=($.isPlainObject(data)||$.isArray(data))?data:JSON.parse(data);\n$.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(); |
|
| 410 | 410 | 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"; |
| 411 | - $retour .= $appendTo; |
|
| 412 | - $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"; |
|
| 413 | - $retour .= "\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 414 | - $retour .= "\t" . $jsCallback; |
|
| 415 | - $parameters["jsCallback"] = $retour; |
|
| 411 | + $retour.=$appendTo; |
|
| 412 | + $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"; |
|
| 413 | + $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
|
| 414 | + $retour.="\t".$jsCallback; |
|
| 415 | + $parameters["jsCallback"]=$retour; |
|
| 416 | 416 | return $this->_ajax($method, $url, null, $parameters); |
| 417 | 417 | } |
| 418 | 418 | |
@@ -427,7 +427,7 @@ discard block |
||
| 427 | 427 | * @param array $parameters |
| 428 | 428 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
| 429 | 429 | */ |
| 430 | - public function jsonArray($maskSelector, $url, $method = "get", $parameters = []) { |
|
| 430 | + public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
|
| 431 | 431 | return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
| 432 | 432 | } |
| 433 | 433 | |
@@ -442,8 +442,8 @@ discard block |
||
| 442 | 442 | * @param array $parameters |
| 443 | 443 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"rowClass"=>"_json") |
| 444 | 444 | */ |
| 445 | - public function jsonArrayDeferred($maskSelector, $url, $method = "get", $parameters) { |
|
| 446 | - $parameters["immediatly"] = false; |
|
| 445 | + public function jsonArrayDeferred($maskSelector, $url, $method="get", $parameters) { |
|
| 446 | + $parameters["immediatly"]=false; |
|
| 447 | 447 | return $this->jsonArray($maskSelector, $url, $method, $parameters); |
| 448 | 448 | } |
| 449 | 449 | |
@@ -459,7 +459,7 @@ discard block |
||
| 459 | 459 | * @param array $parameters |
| 460 | 460 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
| 461 | 461 | */ |
| 462 | - public function jsonArrayOn($event, $element, $maskSelector, $url, $method = "get", $parameters = array()) { |
|
| 462 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
| 463 | 463 | $this->setDefaultParameters($parameters, [ |
| 464 | 464 | "preventDefault" => true, |
| 465 | 465 | "stopPropagation" => true, |
@@ -479,8 +479,8 @@ discard block |
||
| 479 | 479 | * @param array $parameters |
| 480 | 480 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 481 | 481 | */ |
| 482 | - public function getDeferred($url, $responseElement = "", $parameters = []) { |
|
| 483 | - $parameters["immediatly"] = false; |
|
| 482 | + public function getDeferred($url, $responseElement="", $parameters=[]) { |
|
| 483 | + $parameters["immediatly"]=false; |
|
| 484 | 484 | return $this->_get($url, $responseElement, $parameters); |
| 485 | 485 | } |
| 486 | 486 | |
@@ -499,7 +499,7 @@ discard block |
||
| 499 | 499 | * @param array $parameters |
| 500 | 500 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 501 | 501 | */ |
| 502 | - public function getOn($event, $element, $url, $responseElement = "", $parameters = array()) { |
|
| 502 | + public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
| 503 | 503 | $this->setDefaultParameters($parameters, [ |
| 504 | 504 | "preventDefault" => true, |
| 505 | 505 | "stopPropagation" => true, |
@@ -523,7 +523,7 @@ discard block |
||
| 523 | 523 | * @param array $parameters |
| 524 | 524 | * default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 525 | 525 | */ |
| 526 | - public function ajaxOn($event, $element, $url, $responseElement = "", $parameters = array()) { |
|
| 526 | + public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
|
| 527 | 527 | $this->setDefaultParameters($parameters, [ |
| 528 | 528 | "preventDefault" => true, |
| 529 | 529 | "stopPropagation" => true, |
@@ -546,7 +546,7 @@ discard block |
||
| 546 | 546 | * @param array $parameters |
| 547 | 547 | * default : array("method"=>"get","preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 548 | 548 | */ |
| 549 | - public function ajaxOnClick($element, $url, $responseElement = "", $parameters = array()) { |
|
| 549 | + public function ajaxOnClick($element, $url, $responseElement="", $parameters=array()) { |
|
| 550 | 550 | return $this->ajaxOn("click", $element, $url, $responseElement, $parameters); |
| 551 | 551 | } |
| 552 | 552 | |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | * @param array $parameters |
| 564 | 564 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 565 | 565 | */ |
| 566 | - public function getOnClick($element, $url, $responseElement = "", $parameters = array()) { |
|
| 566 | + public function getOnClick($element, $url, $responseElement="", $parameters=array()) { |
|
| 567 | 567 | return $this->getOn("click", $element, $url, $responseElement, $parameters); |
| 568 | 568 | } |
| 569 | 569 | |
@@ -578,13 +578,13 @@ discard block |
||
| 578 | 578 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>true) |
| 579 | 579 | * @return $this |
| 580 | 580 | */ |
| 581 | - public function getHref($element, $responseElement = "", $parameters = array()) { |
|
| 582 | - $parameters["attr"] = "href"; |
|
| 581 | + public function getHref($element, $responseElement="", $parameters=array()) { |
|
| 582 | + $parameters["attr"]="href"; |
|
| 583 | 583 | if (JString::isNull($responseElement)) { |
| 584 | - $responseElement = '%$(self).attr("data-target")%'; |
|
| 584 | + $responseElement='%$(self).attr("data-target")%'; |
|
| 585 | 585 | } |
| 586 | - if (! isset($parameters["historize"])) { |
|
| 587 | - $parameters["historize"] = true; |
|
| 586 | + if (!isset($parameters["historize"])) { |
|
| 587 | + $parameters["historize"]=true; |
|
| 588 | 588 | } |
| 589 | 589 | return $this->getOnClick($element, "", $responseElement, $parameters); |
| 590 | 590 | } |
@@ -600,19 +600,19 @@ discard block |
||
| 600 | 600 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"params"=>"{}","jsCallback"=>NULL,"attr"=>"href","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 601 | 601 | * @return $this |
| 602 | 602 | */ |
| 603 | - public function postHref($element, $responseElement = "", $parameters = array()) { |
|
| 604 | - $parameters["attr"] = "href"; |
|
| 603 | + public function postHref($element, $responseElement="", $parameters=array()) { |
|
| 604 | + $parameters["attr"]="href"; |
|
| 605 | 605 | if (JString::isNull($responseElement)) { |
| 606 | - $responseElement = '%$(this).attr("data-target")%'; |
|
| 606 | + $responseElement='%$(this).attr("data-target")%'; |
|
| 607 | 607 | } |
| 608 | - if (! isset($parameters["historize"])) { |
|
| 609 | - $parameters["historize"] = true; |
|
| 608 | + if (!isset($parameters["historize"])) { |
|
| 609 | + $parameters["historize"]=true; |
|
| 610 | 610 | } |
| 611 | 611 | return $this->postOnClick($element, "", "{}", $responseElement, $parameters); |
| 612 | 612 | } |
| 613 | 613 | |
| 614 | - private function _post($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 615 | - $parameters["params"] = $params; |
|
| 614 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 615 | + $parameters["params"]=$params; |
|
| 616 | 616 | return $this->_ajax("POST", $url, $responseElement, $parameters); |
| 617 | 617 | } |
| 618 | 618 | |
@@ -628,7 +628,7 @@ discard block |
||
| 628 | 628 | * @param array $parameters |
| 629 | 629 | * default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 630 | 630 | */ |
| 631 | - public function post($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 631 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 632 | 632 | return $this->_post($url, $params, $responseElement, $parameters); |
| 633 | 633 | } |
| 634 | 634 | |
@@ -645,8 +645,8 @@ discard block |
||
| 645 | 645 | * @param array $parameters |
| 646 | 646 | * default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 647 | 647 | */ |
| 648 | - public function postDeferred($url, $params = "{}", $responseElement = "", $parameters = []) { |
|
| 649 | - $parameters["immediatly"] = false; |
|
| 648 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
| 649 | + $parameters["immediatly"]=false; |
|
| 650 | 650 | return $this->_post($url, $params, $responseElement, $parameters); |
| 651 | 651 | } |
| 652 | 652 | |
@@ -665,7 +665,7 @@ discard block |
||
| 665 | 665 | * @param array $parameters |
| 666 | 666 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 667 | 667 | */ |
| 668 | - public function postOn($event, $element, $url, $params = "{}", $responseElement = "", $parameters = array()) { |
|
| 668 | + public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 669 | 669 | $this->setDefaultParameters($parameters, [ |
| 670 | 670 | "preventDefault" => true, |
| 671 | 671 | "stopPropagation" => true, |
@@ -688,66 +688,66 @@ discard block |
||
| 688 | 688 | * @param array $parameters |
| 689 | 689 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 690 | 690 | */ |
| 691 | - public function postOnClick($element, $url, $params = "{}", $responseElement = "", $parameters = array()) { |
|
| 691 | + public function postOnClick($element, $url, $params="{}", $responseElement="", $parameters=array()) { |
|
| 692 | 692 | return $this->postOn("click", $element, $url, $params, $responseElement, $parameters); |
| 693 | 693 | } |
| 694 | 694 | |
| 695 | - private function _postForm($url, $form, $responseElement, $parameters = []) { |
|
| 695 | + private function _postForm($url, $form, $responseElement, $parameters=[]) { |
|
| 696 | 696 | if (isset($this->params["ajax"])) { |
| 697 | 697 | extract($this->params["ajax"]); |
| 698 | 698 | } |
| 699 | - $params = "{}"; |
|
| 700 | - $validation = false; |
|
| 701 | - $hasFiles = false; |
|
| 699 | + $params="{}"; |
|
| 700 | + $validation=false; |
|
| 701 | + $hasFiles=false; |
|
| 702 | 702 | \extract($parameters); |
| 703 | - $async = ($async) ? "true" : "false"; |
|
| 704 | - $jsCallback = isset($jsCallback) ? $jsCallback : ""; |
|
| 705 | - $retour = $this->_getAjaxUrl($url, $attr); |
|
| 706 | - $retour .= "\n$('#" . $form . "').trigger('ajaxSubmit');"; |
|
| 707 | - if (! $hasFiles) { |
|
| 708 | - $retour .= "\nvar params=$('#" . $form . "').serialize();\n"; |
|
| 703 | + $async=($async) ? "true" : "false"; |
|
| 704 | + $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
|
| 705 | + $retour=$this->_getAjaxUrl($url, $attr); |
|
| 706 | + $retour.="\n$('#".$form."').trigger('ajaxSubmit');"; |
|
| 707 | + if (!$hasFiles) { |
|
| 708 | + $retour.="\nvar params=$('#".$form."').serialize();\n"; |
|
| 709 | 709 | if (isset($params)) { |
| 710 | - $retour .= "params+='&'+" . self::_correctParams($params) . ";\n"; |
|
| 710 | + $retour.="params+='&'+".self::_correctParams($params).";\n"; |
|
| 711 | 711 | } |
| 712 | - $ajaxParameters = []; |
|
| 712 | + $ajaxParameters=[]; |
|
| 713 | 713 | } else { |
| 714 | - $retour .= "\nvar params=new FormData($('#" . $form . "')[0]);\n"; |
|
| 715 | - $ajaxParameters = [ |
|
| 714 | + $retour.="\nvar params=new FormData($('#".$form."')[0]);\n"; |
|
| 715 | + $ajaxParameters=[ |
|
| 716 | 716 | 'enctype' => "'multipart/form-data'", |
| 717 | 717 | 'processData' => "false", |
| 718 | 718 | 'contentType' => "false", |
| 719 | 719 | 'timeout' => 600000 |
| 720 | 720 | ]; |
| 721 | 721 | } |
| 722 | - $responseElement = $this->_getResponseElement($responseElement); |
|
| 723 | - $retour .= "var self=this;\n"; |
|
| 724 | - if ($hasLoader === true) { |
|
| 722 | + $responseElement=$this->_getResponseElement($responseElement); |
|
| 723 | + $retour.="var self=this;\n"; |
|
| 724 | + if ($hasLoader===true) { |
|
| 725 | 725 | $this->addLoading($retour, $responseElement, $ajaxLoader); |
| 726 | - } elseif ($hasLoader === "internal") { |
|
| 727 | - $retour .= "\n$(this).addClass('loading');"; |
|
| 726 | + } elseif ($hasLoader==="internal") { |
|
| 727 | + $retour.="\n$(this).addClass('loading');"; |
|
| 728 | 728 | } |
| 729 | - $ajaxParameters = [ |
|
| 729 | + $ajaxParameters=[ |
|
| 730 | 730 | "url" => "url", |
| 731 | 731 | "method" => "'POST'", |
| 732 | 732 | "data" => "params", |
| 733 | 733 | "async" => $async |
| 734 | - ] + $ajaxParameters; |
|
| 734 | + ]+$ajaxParameters; |
|
| 735 | 735 | if (isset($headers)) { |
| 736 | - $ajaxParameters["headers"] = $headers; |
|
| 736 | + $ajaxParameters["headers"]=$headers; |
|
| 737 | 737 | } |
| 738 | 738 | $this->createAjaxParameters($ajaxParameters, $parameters); |
| 739 | - $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data ) {\n"; |
|
| 740 | - $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader) . "});\n"; |
|
| 739 | + $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
|
| 740 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n"; |
|
| 741 | 741 | |
| 742 | 742 | if ($validation) { |
| 743 | - $retour = "$('#" . $form . "').validate({submitHandler: function(form) { |
|
| 744 | - " . $retour . " |
|
| 743 | + $retour="$('#".$form."').validate({submitHandler: function(form) { |
|
| 744 | + " . $retour." |
|
| 745 | 745 | }});\n"; |
| 746 | - $retour .= "$('#" . $form . "').submit();\n"; |
|
| 746 | + $retour.="$('#".$form."').submit();\n"; |
|
| 747 | 747 | } |
| 748 | - $retour = $this->_addJsCondition($jsCondition, $retour); |
|
| 748 | + $retour=$this->_addJsCondition($jsCondition, $retour); |
|
| 749 | 749 | if ($immediatly) |
| 750 | - $this->jquery_code_for_compile[] = $retour; |
|
| 750 | + $this->jquery_code_for_compile[]=$retour; |
|
| 751 | 751 | return $retour; |
| 752 | 752 | } |
| 753 | 753 | |
@@ -763,8 +763,8 @@ discard block |
||
| 763 | 763 | * @param array $parameters |
| 764 | 764 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 765 | 765 | */ |
| 766 | - public function postForm($url, $form, $responseElement, $parameters = []) { |
|
| 767 | - $parameters["immediatly"] = true; |
|
| 766 | + public function postForm($url, $form, $responseElement, $parameters=[]) { |
|
| 767 | + $parameters["immediatly"]=true; |
|
| 768 | 768 | return $this->_postForm($url, $form, $responseElement, $parameters); |
| 769 | 769 | } |
| 770 | 770 | |
@@ -781,8 +781,8 @@ discard block |
||
| 781 | 781 | * @param array $parameters |
| 782 | 782 | * default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
| 783 | 783 | */ |
| 784 | - public function postFormDeferred($url, $form, $responseElement, $parameters = []) { |
|
| 785 | - $parameters["immediatly"] = false; |
|
| 784 | + public function postFormDeferred($url, $form, $responseElement, $parameters=[]) { |
|
| 785 | + $parameters["immediatly"]=false; |
|
| 786 | 786 | return $this->_postForm($url, $form, $responseElement, $parameters); |
| 787 | 787 | } |
| 788 | 788 | |
@@ -799,7 +799,7 @@ discard block |
||
| 799 | 799 | * @param array $parameters |
| 800 | 800 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 801 | 801 | */ |
| 802 | - public function postFormOn($event, $element, $url, $form, $responseElement = "", $parameters = array()) { |
|
| 802 | + public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 803 | 803 | $this->setDefaultParameters($parameters, [ |
| 804 | 804 | "preventDefault" => true, |
| 805 | 805 | "stopPropagation" => true, |
@@ -820,7 +820,7 @@ discard block |
||
| 820 | 820 | * @param array $parameters |
| 821 | 821 | * default : array("preventDefault"=>true,"stopPropagation"=>true,"validation"=>false,"params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>null,"headers"=>null,"historize"=>false) |
| 822 | 822 | */ |
| 823 | - public function postFormOnClick($element, $url, $form, $responseElement = "", $parameters = array()) { |
|
| 823 | + public function postFormOnClick($element, $url, $form, $responseElement="", $parameters=array()) { |
|
| 824 | 824 | return $this->postFormOn("click", $element, $url, $form, $responseElement, $parameters); |
| 825 | 825 | } |
| 826 | 826 | } |
@@ -59,8 +59,9 @@ discard block |
||
| 59 | 59 | $retour .= "$.ajax({" . $this->implodeAjaxParameters($ajaxParameters) . "}).done(function( data, textStatus, jqXHR ) {\n"; |
| 60 | 60 | $retour .= $this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null)) . "});\n"; |
| 61 | 61 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 62 | - if ($immediatly) |
|
| 63 | - $this->jquery_code_for_compile[] = $retour; |
|
| 62 | + if ($immediatly) { |
|
| 63 | + $this->jquery_code_for_compile[] = $retour; |
|
| 64 | + } |
|
| 64 | 65 | return $retour; |
| 65 | 66 | } |
| 66 | 67 | |
@@ -114,8 +115,9 @@ discard block |
||
| 114 | 115 | $retour .= "url=url+'" . $slash . "'+$(this).html();\n"; |
| 115 | 116 | } elseif (\substr($attr, 0, 3) === "js:") { |
| 116 | 117 | $retour .= "url=url+'" . $slash . "'+" . \substr($attr, 3) . ";\n"; |
| 117 | - } elseif ($attr !== null && $attr !== "") |
|
| 118 | - $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 118 | + } elseif ($attr !== null && $attr !== "") { |
|
| 119 | + $retour .= "url=url+'" . $slash . "'+($(this).attr('" . $attr . "')||'');\n"; |
|
| 120 | + } |
|
| 119 | 121 | } |
| 120 | 122 | return $retour; |
| 121 | 123 | } |
@@ -139,10 +141,11 @@ discard block |
||
| 139 | 141 | } elseif (isset($this->ajaxTransition)) { |
| 140 | 142 | $call = $this->ajaxTransition; |
| 141 | 143 | } |
| 142 | - if (\is_callable($call)) |
|
| 143 | - $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 144 | - else |
|
| 145 | - $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 144 | + if (\is_callable($call)) { |
|
| 145 | + $retour = "\t" . $call($responseElement, $jqueryDone) . ";\n"; |
|
| 146 | + } else { |
|
| 147 | + $retour = "\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
| 148 | + } |
|
| 146 | 149 | } |
| 147 | 150 | if (isset($history)) { |
| 148 | 151 | if ($this->params["autoActiveLinks"]) { |
@@ -165,8 +168,9 @@ discard block |
||
| 165 | 168 | } |
| 166 | 169 | |
| 167 | 170 | protected function _correctAjaxUrl($url) { |
| 168 | - if ($url !== "/" && JString::endsWith($url, "/") === true) |
|
| 169 | - $url = substr($url, 0, strlen($url) - 1); |
|
| 171 | + if ($url !== "/" && JString::endsWith($url, "/") === true) { |
|
| 172 | + $url = substr($url, 0, strlen($url) - 1); |
|
| 173 | + } |
|
| 170 | 174 | if (strncmp($url, 'http://', 7) != 0 && strncmp($url, 'https://', 8) != 0) { |
| 171 | 175 | $url = $this->getUrl($url); |
| 172 | 176 | } |
@@ -190,8 +194,9 @@ discard block |
||
| 190 | 194 | public static function _implodeParams($parameters) { |
| 191 | 195 | $allParameters = []; |
| 192 | 196 | foreach ($parameters as $params) { |
| 193 | - if (isset($params)) |
|
| 194 | - $allParameters[] = self::_correctParams($params); |
|
| 197 | + if (isset($params)) { |
|
| 198 | + $allParameters[] = self::_correctParams($params); |
|
| 199 | + } |
|
| 195 | 200 | } |
| 196 | 201 | return \implode("+'&'+", $allParameters); |
| 197 | 202 | } |
@@ -217,8 +222,9 @@ discard block |
||
| 217 | 222 | |
| 218 | 223 | protected function setDefaultParameters(&$parameters, $default) { |
| 219 | 224 | foreach ($default as $k => $v) { |
| 220 | - if (! isset($parameters[$k])) |
|
| 221 | - $parameters[$k] = $v; |
|
| 225 | + if (! isset($parameters[$k])) { |
|
| 226 | + $parameters[$k] = $v; |
|
| 227 | + } |
|
| 222 | 228 | } |
| 223 | 229 | } |
| 224 | 230 | |
@@ -746,8 +752,9 @@ discard block |
||
| 746 | 752 | $retour .= "$('#" . $form . "').submit();\n"; |
| 747 | 753 | } |
| 748 | 754 | $retour = $this->_addJsCondition($jsCondition, $retour); |
| 749 | - if ($immediatly) |
|
| 750 | - $this->jquery_code_for_compile[] = $retour; |
|
| 755 | + if ($immediatly) { |
|
| 756 | + $this->jquery_code_for_compile[] = $retour; |
|
| 757 | + } |
|
| 751 | 758 | return $retour; |
| 752 | 759 | } |
| 753 | 760 | |
