Skip to content

Commit 8583804

Browse files
committed
[Fix] non unique js components
1 parent e7448c4 commit 8583804

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

Ajax/common/BaseGui.php

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,16 @@ public function setJs(JsUtils $js) {
5454
}
5555

5656
public function addComponent(SimpleComponent $component, $attachTo, $params) {
57-
if ($this->autoCompile)
58-
$this->components []=$component;
59-
if (isset($attachTo))
60-
$component->attach($attachTo);
57+
if ($this->autoCompile){
58+
if($attachTo!=null){
59+
if(!isset($this->components [$attachTo])){
60+
$this->components [$attachTo]=$component;
61+
}
62+
$component->attach($attachTo);
63+
}else{
64+
$this->components []=$component;
65+
}
66+
}
6167
if (isset($params))
6268
if (\is_array($params))
6369
$component->setParams($params);

Ajax/semantic/html/collections/form/traits/FormTrait.php

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,36 +22,30 @@ trait FormTrait{
2222
*/
2323
abstract protected function getForm();
2424

25-
protected $_runnedParams=false;
2625

2726
protected function addCompoValidation(Form $compo,HtmlFormField $field){
2827
$validation=$field->getValidation();
2928
if(isset($validation)){
3029
$validation->setIdentifier($field->getDataField()->getIdentifier());
3130
$compo->addFieldValidation($validation);
3231
}
33-
return $compo;
3432
}
3533

3634
protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){
3735
$compo->addFieldValidation($validation);
38-
return $compo;
3936
}
4037

4138
protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){
42-
if(!$this->_runnedParams){
43-
$form=$this->getForm();
44-
$params=$form->getValidationParams();
45-
if(isset($params["_ajaxSubmit"])){
46-
$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
47-
$this->onSuccess($compilation);
48-
$form->removeValidationParam("_ajaxSubmit");
49-
}
50-
$compo->addParams($form->getValidationParams());
51-
$form->setBsComponent($compo);
52-
$form->addEventsOnRun($js);
53-
$this->_runnedParams=true;
39+
$form=$this->getForm();
40+
$params=$form->getValidationParams();
41+
if(isset($params["_ajaxSubmit"])){
42+
$compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js);
43+
$this->onSuccess($compilation);
44+
$form->removeValidationParam("_ajaxSubmit");
5445
}
46+
$compo->addParams($form->getValidationParams());
47+
$form->setBsComponent($compo);
48+
$form->addEventsOnRun($js);
5549
}
5650

5751
protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){

0 commit comments

Comments
 (0)