@@ -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|HtmlButton |
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 | } |
@@ -50,13 +50,13 @@ discard block |
||
50 | 50 | */ |
51 | 51 | public function addElement($element, $asIcon=false) { |
52 | 52 | $item=$this->addItem($element); |
53 | - if($asIcon && $item instanceof HtmlButton) |
|
53 | + if ($asIcon && $item instanceof HtmlButton) |
|
54 | 54 | $item->asIcon($element); |
55 | 55 | return $item; |
56 | 56 | } |
57 | 57 | |
58 | 58 | public function addElements($elements, $asIcons=false) { |
59 | - foreach ( $elements as $element ) { |
|
59 | + foreach ($elements as $element) { |
|
60 | 60 | $this->addElement($element, $asIcons); |
61 | 61 | } |
62 | 62 | return $this; |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | public function insertOr($aferIndex=0, $or="or") { |
66 | 66 | $orElement=new HtmlSemDoubleElement("", "div", "or"); |
67 | 67 | $orElement->setProperty("data-text", $or); |
68 | - array_splice($this->content, $aferIndex + 1, 0, array ($orElement )); |
|
68 | + array_splice($this->content, $aferIndex+1, 0, array($orElement)); |
|
69 | 69 | return $this; |
70 | 70 | } |
71 | 71 | |
@@ -78,8 +78,8 @@ discard block |
||
78 | 78 | } |
79 | 79 | |
80 | 80 | public function asIcons() { |
81 | - foreach ( $this->content as $item ) { |
|
82 | - if($item instanceof HtmlButton) |
|
81 | + foreach ($this->content as $item) { |
|
82 | + if ($item instanceof HtmlButton) |
|
83 | 83 | $item->asIcon($item->getContent()); |
84 | 84 | } |
85 | 85 | return $this->addToProperty("class", "icons"); |
@@ -90,9 +90,9 @@ discard block |
||
90 | 90 | * @param array $icons |
91 | 91 | * @return HtmlButtonGroups |
92 | 92 | */ |
93 | - public function addIcons($icons){ |
|
94 | - foreach ( $this->content as $index=>$item ) { |
|
95 | - if($item instanceof HtmlButton && isset($icons[$index])) |
|
93 | + public function addIcons($icons) { |
|
94 | + foreach ($this->content as $index=>$item) { |
|
95 | + if ($item instanceof HtmlButton && isset($icons[$index])) |
|
96 | 96 | $item->addIcon($icons[$index]); |
97 | 97 | } |
98 | 98 | return $this; |
@@ -132,7 +132,7 @@ discard block |
||
132 | 132 | * @see \Ajax\bootstrap\html\base\BaseHtml::on() |
133 | 133 | */ |
134 | 134 | public function on($event, $jsCode, $stopPropagation=false, $preventDefault=false) { |
135 | - foreach ( $this->content as $element ) { |
|
135 | + foreach ($this->content as $element) { |
|
136 | 136 | $element->on($event, $jsCode, $stopPropagation, $preventDefault); |
137 | 137 | } |
138 | 138 | return $this; |
@@ -144,10 +144,10 @@ discard block |
||
144 | 144 | |
145 | 145 | public function addClasses($classes=array()) { |
146 | 146 | $i=0; |
147 | - if(!\is_array($classes)){ |
|
148 | - $classes=array_fill (0,$this->count(),$classes); |
|
147 | + if (!\is_array($classes)) { |
|
148 | + $classes=array_fill(0, $this->count(), $classes); |
|
149 | 149 | } |
150 | - foreach ( $this->content as $button ) { |
|
150 | + foreach ($this->content as $button) { |
|
151 | 151 | $button->addToProperty("class", $classes[$i++]); |
152 | 152 | } |
153 | 153 | return $this; |
@@ -161,8 +161,8 @@ discard block |
||
161 | 161 | $this->addElement($function($object)); |
162 | 162 | } |
163 | 163 | |
164 | - public function run(JsUtils $js){ |
|
165 | - $result= parent::run($js); |
|
164 | + public function run(JsUtils $js) { |
|
165 | + $result=parent::run($js); |
|
166 | 166 | return $result->setItemSelector(".ui.button"); |
167 | 167 | } |
168 | 168 |
@@ -18,8 +18,9 @@ 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) |
|
22 | - $this->asIcons(); |
|
21 | + if ($asIcons === true) { |
|
22 | + $this->asIcons(); |
|
23 | + } |
|
23 | 24 | $this->addElements($elements, $asIcons); |
24 | 25 | } |
25 | 26 | protected function createItem($value){ |
@@ -50,8 +51,9 @@ discard block |
||
50 | 51 | */ |
51 | 52 | public function addElement($element, $asIcon=false) { |
52 | 53 | $item=$this->addItem($element); |
53 | - if($asIcon && $item instanceof HtmlButton) |
|
54 | - $item->asIcon($element); |
|
54 | + if($asIcon && $item instanceof HtmlButton) { |
|
55 | + $item->asIcon($element); |
|
56 | + } |
|
55 | 57 | return $item; |
56 | 58 | } |
57 | 59 | |
@@ -79,8 +81,9 @@ discard block |
||
79 | 81 | |
80 | 82 | public function asIcons() { |
81 | 83 | foreach ( $this->content as $item ) { |
82 | - if($item instanceof HtmlButton) |
|
83 | - $item->asIcon($item->getContent()); |
|
84 | + if($item instanceof HtmlButton) { |
|
85 | + $item->asIcon($item->getContent()); |
|
86 | + } |
|
84 | 87 | } |
85 | 88 | return $this->addToProperty("class", "icons"); |
86 | 89 | } |
@@ -92,8 +95,9 @@ discard block |
||
92 | 95 | */ |
93 | 96 | public function addIcons($icons){ |
94 | 97 | foreach ( $this->content as $index=>$item ) { |
95 | - if($item instanceof HtmlButton && isset($icons[$index])) |
|
96 | - $item->addIcon($icons[$index]); |
|
98 | + if($item instanceof HtmlButton && isset($icons[$index])) { |
|
99 | + $item->addIcon($icons[$index]); |
|
100 | + } |
|
97 | 101 | } |
98 | 102 | return $this; |
99 | 103 | } |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | |
10 | 10 | abstract class HtmlViewGroups extends HtmlSemCollection { |
11 | 11 | |
12 | - public function __construct($identifier, $uiClass,$items=array()) { |
|
12 | + public function __construct($identifier, $uiClass, $items=array()) { |
|
13 | 13 | parent::__construct($identifier, "div", $uiClass); |
14 | 14 | $this->addItems($items); |
15 | 15 | } |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | * @param int $wide |
42 | 42 | */ |
43 | 43 | public function setWide($wide) { |
44 | - $wide=Wide::getConstants()["W" . $wide]; |
|
44 | + $wide=Wide::getConstants()["W".$wide]; |
|
45 | 45 | return $this->addToPropertyCtrl("class", $wide, Wide::getConstants()); |
46 | 46 | } |
47 | 47 | |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | /** |
51 | 51 | * @return HtmlViewGroups |
52 | 52 | */ |
53 | - public function getItem($index){ |
|
53 | + public function getItem($index) { |
|
54 | 54 | return parent::getItem($index); |
55 | 55 | } |
56 | 56 | |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | $item=$this->getItem($itemIndex); |
59 | 59 | if (isset($item)) { |
60 | 60 | $content=$item->getContent(); |
61 | - if(isset($content[$contentIndex])) |
|
61 | + if (isset($content[$contentIndex])) |
|
62 | 62 | return $content[$contentIndex]; |
63 | 63 | } |
64 | 64 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | return $this->addItem($function($object)); |
68 | 68 | } |
69 | 69 | |
70 | - public function run(JsUtils $js){ |
|
70 | + public function run(JsUtils $js) { |
|
71 | 71 | $result=parent::run($js); |
72 | 72 | return $result->setItemSelector(".item"); |
73 | 73 | } |
@@ -31,8 +31,9 @@ discard block |
||
31 | 31 | if (isset($extra)) { |
32 | 32 | $result->addExtraContent($extra); |
33 | 33 | } |
34 | - } else |
|
35 | - $result->addItemContent($value); |
|
34 | + } else { |
|
35 | + $result->addItemContent($value); |
|
36 | + } |
|
36 | 37 | return $result; |
37 | 38 | } |
38 | 39 | |
@@ -58,8 +59,9 @@ discard block |
||
58 | 59 | $item=$this->getItem($itemIndex); |
59 | 60 | if (isset($item)) { |
60 | 61 | $content=$item->getContent(); |
61 | - if(isset($content[$contentIndex])) |
|
62 | - return $content[$contentIndex]; |
|
62 | + if(isset($content[$contentIndex])) { |
|
63 | + return $content[$contentIndex]; |
|
64 | + } |
|
63 | 65 | } |
64 | 66 | } |
65 | 67 |
@@ -13,11 +13,11 @@ discard block |
||
13 | 13 | class HtmlViewContent extends HtmlSemDoubleElement { |
14 | 14 | use ContentPartTrait; |
15 | 15 | public function __construct($identifier, $content=array()) { |
16 | - parent::__construct($identifier, "div", "content",[]); |
|
16 | + parent::__construct($identifier, "div", "content", []); |
|
17 | 17 | $this->setContent($content); |
18 | 18 | } |
19 | 19 | |
20 | - public function setContent($value){ |
|
20 | + public function setContent($value) { |
|
21 | 21 | if (\is_array($value)) { |
22 | 22 | $header=JArray::getValue($value, "header", 0); |
23 | 23 | $metas=JArray::getValue($value, "metas", 1); |
@@ -27,24 +27,24 @@ discard block |
||
27 | 27 | if (isset($image)) { |
28 | 28 | $this->addImage($image); |
29 | 29 | } |
30 | - $this->addHeaderContent($header, $metas, $description,$extra); |
|
30 | + $this->addHeaderContent($header, $metas, $description, $extra); |
|
31 | 31 | } else |
32 | 32 | $this->addContent($value); |
33 | 33 | } |
34 | 34 | |
35 | 35 | public function addElement($content, $baseClass="") { |
36 | 36 | $count=\sizeof($this->content); |
37 | - $result=new HtmlViewContent("element-" . $count . "-" . $this->identifier, $content); |
|
37 | + $result=new HtmlViewContent("element-".$count."-".$this->identifier, $content); |
|
38 | 38 | $result->setClass($baseClass); |
39 | 39 | $this->addContent($result); |
40 | 40 | return $result; |
41 | 41 | } |
42 | 42 | |
43 | 43 | public function addMeta($value, $direction=Direction::LEFT) { |
44 | - if (\array_key_exists("meta", $this->content) === false) { |
|
45 | - $this->content["meta"]=new HtmlSemDoubleElement("meta-" . $this->identifier, "div", "meta", array ()); |
|
44 | + if (\array_key_exists("meta", $this->content)===false) { |
|
45 | + $this->content["meta"]=new HtmlSemDoubleElement("meta-".$this->identifier, "div", "meta", array()); |
|
46 | 46 | } |
47 | - if ($direction === Direction::RIGHT) { |
|
47 | + if ($direction===Direction::RIGHT) { |
|
48 | 48 | $value=new HtmlSemDoubleElement("", "span", "", $value); |
49 | 49 | $value->setFloated($direction); |
50 | 50 | } |
@@ -53,8 +53,8 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | public function addExtra($value) { |
56 | - if (\array_key_exists("extra", $this->content) === false) { |
|
57 | - $this->content["extra"]=new HtmlSemDoubleElement("extra-" . $this->identifier, "div", "extra", array ()); |
|
56 | + if (\array_key_exists("extra", $this->content)===false) { |
|
57 | + $this->content["extra"]=new HtmlSemDoubleElement("extra-".$this->identifier, "div", "extra", array()); |
|
58 | 58 | } |
59 | 59 | $this->content["extra"]->addContent($value); |
60 | 60 | return $this->content["extra"]; |
@@ -75,15 +75,15 @@ discard block |
||
75 | 75 | * @param boolean $before |
76 | 76 | * @return HtmlButtonGroups |
77 | 77 | */ |
78 | - public function addContentButtons($elements=array(), $asIcons=false,$part="extra",$before=false){ |
|
79 | - $buttons=new HtmlButtonGroups("buttons-".$this->identifier,$elements,$asIcons); |
|
80 | - $this->addElementInPart($buttons,$part, $before,true); |
|
78 | + public function addContentButtons($elements=array(), $asIcons=false, $part="extra", $before=false) { |
|
79 | + $buttons=new HtmlButtonGroups("buttons-".$this->identifier, $elements, $asIcons); |
|
80 | + $this->addElementInPart($buttons, $part, $before, true); |
|
81 | 81 | return $buttons; |
82 | 82 | } |
83 | 83 | |
84 | 84 | public function addMetas($metas) { |
85 | 85 | if (\is_array($metas)) { |
86 | - foreach ( $metas as $meta ) { |
|
86 | + foreach ($metas as $meta) { |
|
87 | 87 | $this->addMeta($meta); |
88 | 88 | } |
89 | 89 | } else |
@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | } |
93 | 93 | |
94 | 94 | public function addContentIcon($icon, $caption=NULL, $direction=Direction::LEFT) { |
95 | - if ($direction === Direction::RIGHT) { |
|
95 | + if ($direction===Direction::RIGHT) { |
|
96 | 96 | if (isset($caption)) { |
97 | 97 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
98 | 98 | $result->addIcon($icon); |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | } |
111 | 111 | |
112 | 112 | public function addContentText($caption, $direction=Direction::LEFT) { |
113 | - if ($direction === Direction::RIGHT) { |
|
113 | + if ($direction===Direction::RIGHT) { |
|
114 | 114 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
115 | 115 | $this->addContent($result); |
116 | 116 | $result->setFloated($direction); |
@@ -120,20 +120,20 @@ discard block |
||
120 | 120 | } |
121 | 121 | |
122 | 122 | public function addContentIcons($icons, $direction=Direction::LEFT) { |
123 | - foreach ( $icons as $icon ) { |
|
123 | + foreach ($icons as $icon) { |
|
124 | 124 | $this->addContentIcon($icon, NULL, $direction); |
125 | 125 | } |
126 | 126 | return $this; |
127 | 127 | } |
128 | 128 | |
129 | - public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
|
130 | - if(isset($header)) |
|
129 | + public function addHeaderContent($header, $metas=array(), $description=NULL, $extra=NULL) { |
|
130 | + if (isset($header)) |
|
131 | 131 | $this->addElement($header, "header"); |
132 | 132 | $this->addMetas($metas); |
133 | 133 | if (isset($description)) { |
134 | 134 | $this->addElement($description, "description"); |
135 | 135 | } |
136 | - if(isset($extra)){ |
|
136 | + if (isset($extra)) { |
|
137 | 137 | $this->addExtra($extra); |
138 | 138 | } |
139 | 139 | return $this; |
@@ -28,8 +28,9 @@ discard block |
||
28 | 28 | $this->addImage($image); |
29 | 29 | } |
30 | 30 | $this->addHeaderContent($header, $metas, $description,$extra); |
31 | - } else |
|
32 | - $this->addContent($value); |
|
31 | + } else { |
|
32 | + $this->addContent($value); |
|
33 | + } |
|
33 | 34 | } |
34 | 35 | |
35 | 36 | public function addElement($content, $baseClass="") { |
@@ -62,8 +63,9 @@ discard block |
||
62 | 63 | |
63 | 64 | public function addImage($src="", $alt="", $size=NULL) { |
64 | 65 | $image=new HtmlImg("img-", $src, $alt); |
65 | - if (isset($size)) |
|
66 | - $image->setSize($size); |
|
66 | + if (isset($size)) { |
|
67 | + $image->setSize($size); |
|
68 | + } |
|
67 | 69 | $this->content['image']=$image; |
68 | 70 | return $image; |
69 | 71 | } |
@@ -86,8 +88,9 @@ discard block |
||
86 | 88 | foreach ( $metas as $meta ) { |
87 | 89 | $this->addMeta($meta); |
88 | 90 | } |
89 | - } else |
|
90 | - $this->addMeta($metas); |
|
91 | + } else { |
|
92 | + $this->addMeta($metas); |
|
93 | + } |
|
91 | 94 | return $this; |
92 | 95 | } |
93 | 96 | |
@@ -114,8 +117,9 @@ discard block |
||
114 | 117 | $result=new HtmlSemDoubleElement("", "span", "", $caption); |
115 | 118 | $this->addContent($result); |
116 | 119 | $result->setFloated($direction); |
117 | - } else |
|
118 | - $result=$this->addContent($caption); |
|
120 | + } else { |
|
121 | + $result=$this->addContent($caption); |
|
122 | + } |
|
119 | 123 | return $result; |
120 | 124 | } |
121 | 125 | |
@@ -127,8 +131,9 @@ discard block |
||
127 | 131 | } |
128 | 132 | |
129 | 133 | public function addHeaderContent($header, $metas=array(), $description=NULL,$extra=NULL) { |
130 | - if(isset($header)) |
|
131 | - $this->addElement($header, "header"); |
|
134 | + if(isset($header)) { |
|
135 | + $this->addElement($header, "header"); |
|
136 | + } |
|
132 | 137 | $this->addMetas($metas); |
133 | 138 | if (isset($description)) { |
134 | 139 | $this->addElement($description, "description"); |
@@ -49,7 +49,7 @@ discard block |
||
49 | 49 | foreach ($ajaxSubmit as $ajaxSubmitItem){ |
50 | 50 | $compilation.=$ajaxSubmitItem->compile($js); |
51 | 51 | } |
52 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
52 | + } elseif($ajaxSubmit instanceof AjaxCall){ |
|
53 | 53 | $compilation=$ajaxSubmit->compile($js); |
54 | 54 | } |
55 | 55 | $compilation=str_ireplace("\"","%quote%", $compilation); |
@@ -67,8 +67,9 @@ discard block |
||
67 | 67 | |
68 | 68 | public function setAttached($value=true){ |
69 | 69 | $form=$this->getForm(); |
70 | - if($value) |
|
71 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
70 | + if($value) { |
|
71 | + $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
72 | + } |
|
72 | 73 | return $form; |
73 | 74 | } |
74 | 75 | |
@@ -90,10 +91,11 @@ discard block |
||
90 | 91 | */ |
91 | 92 | public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
92 | 93 | $form=$this->getForm(); |
93 | - if($identifierOrElement instanceof BaseHtml) |
|
94 | - $elem=$identifierOrElement; |
|
95 | - else |
|
96 | - $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
94 | + if($identifierOrElement instanceof BaseHtml) { |
|
95 | + $elem=$identifierOrElement; |
|
96 | + } else { |
|
97 | + $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
|
98 | + } |
|
97 | 99 | if(isset($elem)){ |
98 | 100 | $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
99 | 101 | } |
@@ -15,32 +15,32 @@ discard block |
||
15 | 15 | * @author jc |
16 | 16 | * |
17 | 17 | */ |
18 | -trait FormTrait{ |
|
18 | +trait FormTrait { |
|
19 | 19 | |
20 | 20 | /** |
21 | 21 | * @return HtmlForm |
22 | 22 | */ |
23 | 23 | abstract protected function getForm(); |
24 | 24 | |
25 | - protected function addCompoValidation(Form $compo,HtmlFormField $field){ |
|
25 | + protected function addCompoValidation(Form $compo, HtmlFormField $field) { |
|
26 | 26 | $validation=$field->getValidation(); |
27 | - if(isset($validation)){ |
|
27 | + if (isset($validation)) { |
|
28 | 28 | $validation->setIdentifier($field->getDataField()->getIdentifier()); |
29 | 29 | $compo->addFieldValidation($validation); |
30 | 30 | } |
31 | 31 | return $compo; |
32 | 32 | } |
33 | 33 | |
34 | - protected function addExtraCompoValidation(Form $compo,FieldValidation $validation){ |
|
34 | + protected function addExtraCompoValidation(Form $compo, FieldValidation $validation) { |
|
35 | 35 | $compo->addFieldValidation($validation); |
36 | 36 | return $compo; |
37 | 37 | } |
38 | 38 | |
39 | - protected function _runValidationParams(Form &$compo,JsUtils $js=NULL){ |
|
39 | + protected function _runValidationParams(Form &$compo, JsUtils $js=NULL) { |
|
40 | 40 | $form=$this->getForm(); |
41 | 41 | $params=$form->getValidationParams(); |
42 | - if(isset($params["_ajaxSubmit"])){ |
|
43 | - $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"],$js); |
|
42 | + if (isset($params["_ajaxSubmit"])) { |
|
43 | + $compilation=$this->_compileAjaxSubmit($params["_ajaxSubmit"], $js); |
|
44 | 44 | $this->onSuccess($compilation); |
45 | 45 | $form->removeValidationParam("_ajaxSubmit"); |
46 | 46 | } |
@@ -49,16 +49,16 @@ discard block |
||
49 | 49 | $form->addEventsOnRun($js); |
50 | 50 | } |
51 | 51 | |
52 | - protected function _compileAjaxSubmit($ajaxSubmit,JsUtils $js=null){ |
|
52 | + protected function _compileAjaxSubmit($ajaxSubmit, JsUtils $js=null) { |
|
53 | 53 | $compilation=""; |
54 | - if(\is_array($ajaxSubmit)){ |
|
55 | - foreach ($ajaxSubmit as $ajaxSubmitItem){ |
|
54 | + if (\is_array($ajaxSubmit)) { |
|
55 | + foreach ($ajaxSubmit as $ajaxSubmitItem) { |
|
56 | 56 | $compilation.=$ajaxSubmitItem->compile($js); |
57 | 57 | } |
58 | - }elseif($ajaxSubmit instanceof AjaxCall){ |
|
58 | + }elseif ($ajaxSubmit instanceof AjaxCall) { |
|
59 | 59 | $compilation=$ajaxSubmit->compile($js); |
60 | 60 | } |
61 | - $compilation=str_ireplace("\"","%quote%", $compilation); |
|
61 | + $compilation=str_ireplace("\"", "%quote%", $compilation); |
|
62 | 62 | return $compilation; |
63 | 63 | } |
64 | 64 | |
@@ -71,14 +71,14 @@ discard block |
||
71 | 71 | return $this; |
72 | 72 | } |
73 | 73 | |
74 | - public function setAttached($value=true){ |
|
74 | + public function setAttached($value=true) { |
|
75 | 75 | $form=$this->getForm(); |
76 | - if($value) |
|
77 | - $form->addToPropertyCtrl("class", "attached", array ("attached" )); |
|
76 | + if ($value) |
|
77 | + $form->addToPropertyCtrl("class", "attached", array("attached")); |
|
78 | 78 | return $form; |
79 | 79 | } |
80 | 80 | |
81 | - public function addErrorMessage(){ |
|
81 | + public function addErrorMessage() { |
|
82 | 82 | return $this->getForm()->addContent((new HtmlMessage(""))->setError()); |
83 | 83 | } |
84 | 84 | |
@@ -94,48 +94,48 @@ discard block |
||
94 | 94 | * @param array $parameters |
95 | 95 | * @return HtmlForm |
96 | 96 | */ |
97 | - public function submitOn($event,$identifierOrElement,$url,$responseElement,$parameters=NULL){ |
|
97 | + public function submitOn($event, $identifierOrElement, $url, $responseElement, $parameters=NULL) { |
|
98 | 98 | $form=$this->getForm(); |
99 | - if($identifierOrElement instanceof BaseHtml) |
|
99 | + if ($identifierOrElement instanceof BaseHtml) |
|
100 | 100 | $elem=$identifierOrElement; |
101 | 101 | else |
102 | 102 | $elem=$form->getElementById($identifierOrElement, $form->getContent()); |
103 | - if(isset($elem)){ |
|
104 | - $this->_buttonAsSubmit($elem, $event,$url,$responseElement,$parameters); |
|
103 | + if (isset($elem)) { |
|
104 | + $this->_buttonAsSubmit($elem, $event, $url, $responseElement, $parameters); |
|
105 | 105 | } |
106 | 106 | return $form; |
107 | 107 | } |
108 | 108 | |
109 | - public function submitOnClick($identifier,$url,$responseElement,$parameters=NULL){ |
|
110 | - return $this->submitOn("click", $identifier, $url, $responseElement,$parameters); |
|
109 | + public function submitOnClick($identifier, $url, $responseElement, $parameters=NULL) { |
|
110 | + return $this->submitOn("click", $identifier, $url, $responseElement, $parameters); |
|
111 | 111 | } |
112 | 112 | |
113 | - public function addSubmit($identifier,$value,$cssStyle=NULL,$url=NULL,$responseElement=NULL,$parameters=NULL){ |
|
114 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
115 | - return $this->_buttonAsSubmit($bt, "click",$url,$responseElement,$parameters); |
|
113 | + public function addSubmit($identifier, $value, $cssStyle=NULL, $url=NULL, $responseElement=NULL, $parameters=NULL) { |
|
114 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
115 | + return $this->_buttonAsSubmit($bt, "click", $url, $responseElement, $parameters); |
|
116 | 116 | } |
117 | 117 | |
118 | - protected function _buttonAsSubmit(BaseHtml &$button,$event,$url,$responseElement=NULL,$parameters=NULL){ |
|
118 | + protected function _buttonAsSubmit(BaseHtml &$button, $event, $url, $responseElement=NULL, $parameters=NULL) { |
|
119 | 119 | $form=$this->getForm(); |
120 | - if(isset($url) && isset($responseElement)){ |
|
121 | - $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');",true,true); |
|
122 | - $this->setSubmitParams($url,$responseElement,$parameters); |
|
120 | + if (isset($url) && isset($responseElement)) { |
|
121 | + $button->addEvent($event, "$('#".$form->getIdentifier()."').form('validate form');", true, true); |
|
122 | + $this->setSubmitParams($url, $responseElement, $parameters); |
|
123 | 123 | } |
124 | 124 | return $button; |
125 | 125 | } |
126 | 126 | |
127 | - public function setSubmitParams($url,$responseElement=NULL,$parameters=NULL){ |
|
127 | + public function setSubmitParams($url, $responseElement=NULL, $parameters=NULL) { |
|
128 | 128 | $form=$this->getForm(); |
129 | - $params=["form"=>$form->getIdentifier(),"responseElement"=>$responseElement,"url"=>$url,"stopPropagation"=>true]; |
|
130 | - if(\is_array($parameters)){ |
|
131 | - $params=\array_merge($params,$parameters); |
|
129 | + $params=["form"=>$form->getIdentifier(), "responseElement"=>$responseElement, "url"=>$url, "stopPropagation"=>true]; |
|
130 | + if (\is_array($parameters)) { |
|
131 | + $params=\array_merge($params, $parameters); |
|
132 | 132 | } |
133 | 133 | $form->addValidationParam("_ajaxSubmit", new AjaxCall("postForm", $params)); |
134 | 134 | return $this; |
135 | 135 | } |
136 | 136 | |
137 | - public function addReset($identifier,$value,$cssStyle=NULL){ |
|
138 | - $bt=$this->getForm()->addButton($identifier, $value,$cssStyle); |
|
137 | + public function addReset($identifier, $value, $cssStyle=NULL) { |
|
138 | + $bt=$this->getForm()->addButton($identifier, $value, $cssStyle); |
|
139 | 139 | $bt->setProperty("type", "reset"); |
140 | 140 | return $bt; |
141 | 141 | } |
@@ -145,7 +145,7 @@ discard block |
||
145 | 145 | * @param string $jsCode |
146 | 146 | * @return \Ajax\semantic\html\collections\form\HtmlForm |
147 | 147 | */ |
148 | - public function onValid($jsCode){ |
|
148 | + public function onValid($jsCode) { |
|
149 | 149 | $form=$this->getForm(); |
150 | 150 | $form->addValidationParam("onValid", "%function(){".$jsCode."}%"); |
151 | 151 | return $form; |
@@ -156,27 +156,27 @@ discard block |
||
156 | 156 | * @param string $jsCode can use event and fields parameters |
157 | 157 | * @return HtmlForm |
158 | 158 | */ |
159 | - public function onSuccess($jsCode){ |
|
159 | + public function onSuccess($jsCode) { |
|
160 | 160 | $form=$this->getForm(); |
161 | - $form->addValidationParam("onSuccess", $jsCode,"%function(event,fields){","}%"); |
|
161 | + $form->addValidationParam("onSuccess", $jsCode, "%function(event,fields){", "}%"); |
|
162 | 162 | return $form; |
163 | 163 | } |
164 | 164 | |
165 | - public function addExtraFieldRules($fieldname,$rules){ |
|
165 | + public function addExtraFieldRules($fieldname, $rules) { |
|
166 | 166 | $form=$this->getForm(); |
167 | 167 | $fv=$form->getExtraFieldValidation($fieldname); |
168 | - foreach ($rules as $rule){ |
|
168 | + foreach ($rules as $rule) { |
|
169 | 169 | $fv->addRule($rule); |
170 | 170 | } |
171 | 171 | } |
172 | 172 | |
173 | - public function addExtraFieldRule($fieldname,$type,$prompt=NULL,$value=NULL){ |
|
173 | + public function addExtraFieldRule($fieldname, $type, $prompt=NULL, $value=NULL) { |
|
174 | 174 | $form=$this->getForm(); |
175 | 175 | $fv=$form->getExtraFieldValidation($fieldname); |
176 | - $fv->addRule($type,$prompt,$value); |
|
176 | + $fv->addRule($type, $prompt, $value); |
|
177 | 177 | } |
178 | 178 | |
179 | - public function setOptional($fieldname,$optional=true){ |
|
179 | + public function setOptional($fieldname, $optional=true) { |
|
180 | 180 | $form=$this->getForm(); |
181 | 181 | $fv=$form->getExtraFieldValidation($fieldname); |
182 | 182 | $fv->setOptional($optional); |
@@ -123,8 +123,9 @@ |
||
123 | 123 | } |
124 | 124 | |
125 | 125 | public function run(JsUtils $js){ |
126 | - if(JString::isNotNull($this->_identifier)) |
|
127 | - $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
126 | + if(JString::isNotNull($this->_identifier)) { |
|
127 | + $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
|
128 | + } |
|
128 | 129 | parent::run($js); |
129 | 130 | } |
130 | 131 | } |
@@ -22,58 +22,58 @@ discard block |
||
22 | 22 | protected $_colWidths; |
23 | 23 | |
24 | 24 | public function __construct($identifier, $modelInstance=NULL) { |
25 | - parent::__construct($identifier, null,$modelInstance); |
|
26 | - $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0,2), false); |
|
25 | + parent::__construct($identifier, null, $modelInstance); |
|
26 | + $this->_init(new DeInstanceViewer($identifier), "table", new HtmlTable($identifier, 0, 2), false); |
|
27 | 27 | $this->content["table"]->setDefinition()->addClass("_element"); |
28 | 28 | } |
29 | 29 | |
30 | - public function compile(JsUtils $js=NULL,&$view=NULL){ |
|
31 | - if(!$this->_generated){ |
|
30 | + public function compile(JsUtils $js=NULL, &$view=NULL) { |
|
31 | + if (!$this->_generated) { |
|
32 | 32 | $this->_instanceViewer->setInstance($this->_modelInstance); |
33 | 33 | |
34 | 34 | $table=$this->content["table"]; |
35 | 35 | $this->_generateContent($table); |
36 | 36 | |
37 | - if(isset($this->_toolbar)){ |
|
37 | + if (isset($this->_toolbar)) { |
|
38 | 38 | $this->_setToolbarPosition($table); |
39 | 39 | } |
40 | - if(isset($this->_colWidths)){ |
|
40 | + if (isset($this->_colWidths)) { |
|
41 | 41 | $this->_applyStyleAttributes($table); |
42 | 42 | } |
43 | - $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE,"table",PositionInTable::AFTERTABLE]); |
|
43 | + $this->content=JArray::sortAssociative($this->content, [PositionInTable::BEFORETABLE, "table", PositionInTable::AFTERTABLE]); |
|
44 | 44 | $this->_compileForm(); |
45 | 45 | $this->_generated=true; |
46 | 46 | } |
47 | - return parent::compile($js,$view); |
|
47 | + return parent::compile($js, $view); |
|
48 | 48 | } |
49 | 49 | |
50 | 50 | /** |
51 | 51 | * @param HtmlTable $table |
52 | 52 | */ |
53 | - protected function _generateContent($table){ |
|
54 | - $values= $this->_instanceViewer->getValues(); |
|
53 | + protected function _generateContent($table) { |
|
54 | + $values=$this->_instanceViewer->getValues(); |
|
55 | 55 | $captions=$this->_instanceViewer->getCaptions(); |
56 | 56 | $fields=$this->_instanceViewer->getVisibleProperties(); |
57 | 57 | $count=$this->_instanceViewer->count(); |
58 | 58 | $this->setProperty("data-ajax", $this->_instanceViewer->getIdentifier()); |
59 | - for($i=0;$i<$count;$i++){ |
|
60 | - $row=$table->addRow([$captions[$i],$values[$i]]); |
|
59 | + for ($i=0; $i<$count; $i++) { |
|
60 | + $row=$table->addRow([$captions[$i], $values[$i]]); |
|
61 | 61 | $row->getItem(1)->setProperty("data-field", $fields[$i]); |
62 | 62 | } |
63 | 63 | } |
64 | 64 | |
65 | - protected function _applyStyleAttributes(HtmlTable $table){ |
|
65 | + protected function _applyStyleAttributes(HtmlTable $table) { |
|
66 | 66 | $table->setColWidths($this->_colWidths); |
67 | 67 | } |
68 | - protected function _getFieldName($index){ |
|
68 | + protected function _getFieldName($index) { |
|
69 | 69 | return $this->_instanceViewer->getFieldName($index); |
70 | 70 | } |
71 | 71 | |
72 | - protected function _getFieldCaption($index){ |
|
72 | + protected function _getFieldCaption($index) { |
|
73 | 73 | return null; |
74 | 74 | } |
75 | 75 | |
76 | - protected function _getFieldIdentifier($prefix,$name=""){ |
|
76 | + protected function _getFieldIdentifier($prefix, $name="") { |
|
77 | 77 | return $this->identifier."-{$prefix}-".$name; |
78 | 78 | } |
79 | 79 | |
@@ -105,11 +105,11 @@ discard block |
||
105 | 105 | return $this; |
106 | 106 | } |
107 | 107 | |
108 | - public function asForm(){ |
|
108 | + public function asForm() { |
|
109 | 109 | return $this->getForm(); |
110 | 110 | } |
111 | 111 | |
112 | - public function setColCaptionWidth($width){ |
|
112 | + public function setColCaptionWidth($width) { |
|
113 | 113 | $this->_colWidths[0]=$width; |
114 | 114 | return $this; |
115 | 115 | } |
@@ -119,13 +119,13 @@ discard block |
||
119 | 119 | return $this; |
120 | 120 | } |
121 | 121 | |
122 | - public function setColWidths($widths){ |
|
122 | + public function setColWidths($widths) { |
|
123 | 123 | $this->_colWidths=$widths; |
124 | 124 | return $this; |
125 | 125 | } |
126 | 126 | |
127 | - public function run(JsUtils $js){ |
|
128 | - if(JString::isNotNull($this->_identifier)) |
|
127 | + public function run(JsUtils $js) { |
|
128 | + if (JString::isNotNull($this->_identifier)) |
|
129 | 129 | $js->execOn("click", "#".$this->_identifier." .ui.toggle", 'var active=$(this).hasClass("active");$(this).children("i").toggleClass("up",active).toggleClass("down",!active);var nextTd=$(this).closest("td").next("td");nextTd.children(":not(.toggle-caption)").toggle(active);nextTd.children(".toggle-caption").toggle(!active);$(this).trigger({type:"toggled",active: active,caption: nextTd.children(".toggle-caption")});'); |
130 | 130 | parent::run($js); |
131 | 131 | } |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | use BaseTrait; |
24 | 24 | protected $_popup=NULL; |
25 | 25 | protected $_dimmer=NULL; |
26 | - protected $_params=array (); |
|
26 | + protected $_params=array(); |
|
27 | 27 | |
28 | 28 | |
29 | 29 | public function __construct($identifier, $tagName="p", $baseClass="ui", $content=NULL) { |
@@ -79,7 +79,7 @@ discard block |
||
79 | 79 | * @return HtmlDimmer |
80 | 80 | */ |
81 | 81 | public function addDimmer($params=array(), $content=NULL) { |
82 | - $dimmer=new HtmlDimmer("dimmer-" . $this->identifier, $content); |
|
82 | + $dimmer=new HtmlDimmer("dimmer-".$this->identifier, $content); |
|
83 | 83 | $dimmer->setParams($params); |
84 | 84 | $dimmer->setContainer($this); |
85 | 85 | $this->addContent($dimmer); |
@@ -95,12 +95,12 @@ discard block |
||
95 | 95 | */ |
96 | 96 | public function addLabel($label, $before=false, $icon=NULL) { |
97 | 97 | $labelO=$label; |
98 | - if (\is_object($label) === false) { |
|
99 | - $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
|
98 | + if (\is_object($label)===false) { |
|
99 | + $labelO=new HtmlLabel("label-".$this->identifier, $label); |
|
100 | 100 | if (isset($icon)) |
101 | 101 | $labelO->addIcon($icon); |
102 | 102 | } else { |
103 | - $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
|
103 | + $labelO->addToPropertyCtrl("class", "label", array("label")); |
|
104 | 104 | } |
105 | 105 | $this->addContent($labelO, $before); |
106 | 106 | return $labelO; |
@@ -114,9 +114,9 @@ discard block |
||
114 | 114 | * @param string $icon |
115 | 115 | * @return HtmlSemDoubleElement |
116 | 116 | */ |
117 | - public function attachLabel($label,$side=Side::TOP,$direction=Direction::NONE,$icon=NULL){ |
|
118 | - $label=$this->addLabel($label,true,$icon); |
|
119 | - $label->setAttached($side,$direction); |
|
117 | + public function attachLabel($label, $side=Side::TOP, $direction=Direction::NONE, $icon=NULL) { |
|
118 | + $label=$this->addLabel($label, true, $icon); |
|
119 | + $label->setAttached($side, $direction); |
|
120 | 120 | return $this; |
121 | 121 | } |
122 | 122 | |
@@ -124,10 +124,10 @@ discard block |
||
124 | 124 | * Transforms the element into a link |
125 | 125 | * @return HtmlSemDoubleElement |
126 | 126 | */ |
127 | - public function asLink($href=NULL,$target=NULL) { |
|
127 | + public function asLink($href=NULL, $target=NULL) { |
|
128 | 128 | if (isset($href)) |
129 | 129 | $this->setProperty("href", $href); |
130 | - if(isset($target)) |
|
130 | + if (isset($target)) |
|
131 | 131 | $this->setProperty("target", $target); |
132 | 132 | return $this->setTagName("a"); |
133 | 133 | } |
@@ -139,9 +139,9 @@ discard block |
||
139 | 139 | */ |
140 | 140 | public function jsShowDimmer($show=true) { |
141 | 141 | $status="hide"; |
142 | - if ($show === true) |
|
142 | + if ($show===true) |
|
143 | 143 | $status="show"; |
144 | - return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
|
144 | + return '$("#.'.$this->identifier.').dimmer("'.$status.'");'; |
|
145 | 145 | } |
146 | 146 | |
147 | 147 | /** |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | * @see BaseHtml::compile() |
150 | 150 | */ |
151 | 151 | public function compile(JsUtils $js=NULL, &$view=NULL) { |
152 | - if (isset($this->_popup)){ |
|
152 | + if (isset($this->_popup)) { |
|
153 | 153 | $this->_popup->compile($js); |
154 | 154 | } |
155 | 155 | return parent::compile($js, $view); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | * @see HtmlDoubleElement::run() |
161 | 161 | */ |
162 | 162 | public function run(JsUtils $js) { |
163 | - $this->_bsComponent=$js->semantic()->generic("#" . $this->identifier); |
|
163 | + $this->_bsComponent=$js->semantic()->generic("#".$this->identifier); |
|
164 | 164 | parent::run($js); |
165 | 165 | $this->addEventsOnRun($js); |
166 | 166 | if (isset($this->_popup)) { |
@@ -169,8 +169,8 @@ discard block |
||
169 | 169 | return $this->_bsComponent; |
170 | 170 | } |
171 | 171 | |
172 | - public function addList($items,$ordered=false){ |
|
173 | - $list=new HtmlList("list-".$this->identifier,$items); |
|
172 | + public function addList($items, $ordered=false) { |
|
173 | + $list=new HtmlList("list-".$this->identifier, $items); |
|
174 | 174 | $list->setOrdered($ordered); |
175 | 175 | $list->setClass("ui list"); |
176 | 176 | $this->addContent($list); |
@@ -41,8 +41,9 @@ discard block |
||
41 | 41 | * @param string $popupEvent |
42 | 42 | */ |
43 | 43 | public function setPopupAttributes($variation=NULL, $popupEvent=NULL) { |
44 | - if (isset($this->_popup)) |
|
45 | - $this->_popup->setAttributes($variation, $popupEvent); |
|
44 | + if (isset($this->_popup)) { |
|
45 | + $this->_popup->setAttributes($variation, $popupEvent); |
|
46 | + } |
|
46 | 47 | } |
47 | 48 | |
48 | 49 | /** |
@@ -97,8 +98,9 @@ discard block |
||
97 | 98 | $labelO=$label; |
98 | 99 | if (\is_object($label) === false) { |
99 | 100 | $labelO=new HtmlLabel("label-" . $this->identifier, $label); |
100 | - if (isset($icon)) |
|
101 | - $labelO->addIcon($icon); |
|
101 | + if (isset($icon)) { |
|
102 | + $labelO->addIcon($icon); |
|
103 | + } |
|
102 | 104 | } else { |
103 | 105 | $labelO->addToPropertyCtrl("class", "label", array ("label" )); |
104 | 106 | } |
@@ -125,10 +127,12 @@ discard block |
||
125 | 127 | * @return HtmlSemDoubleElement |
126 | 128 | */ |
127 | 129 | public function asLink($href=NULL,$target=NULL) { |
128 | - if (isset($href)) |
|
129 | - $this->setProperty("href", $href); |
|
130 | - if(isset($target)) |
|
131 | - $this->setProperty("target", $target); |
|
130 | + if (isset($href)) { |
|
131 | + $this->setProperty("href", $href); |
|
132 | + } |
|
133 | + if(isset($target)) { |
|
134 | + $this->setProperty("target", $target); |
|
135 | + } |
|
132 | 136 | return $this->setTagName("a"); |
133 | 137 | } |
134 | 138 | |
@@ -139,8 +143,9 @@ discard block |
||
139 | 143 | */ |
140 | 144 | public function jsShowDimmer($show=true) { |
141 | 145 | $status="hide"; |
142 | - if ($show === true) |
|
143 | - $status="show"; |
|
146 | + if ($show === true) { |
|
147 | + $status="show"; |
|
148 | + } |
|
144 | 149 | return '$("#.' . $this->identifier . ').dimmer("' . $status . '");'; |
145 | 150 | } |
146 | 151 |
@@ -2,10 +2,10 @@ discard block |
||
2 | 2 | namespace Ajax\common\traits; |
3 | 3 | use Ajax\common\BaseGui; |
4 | 4 | |
5 | -trait JsUtilsInternalTrait{ |
|
5 | +trait JsUtilsInternalTrait { |
|
6 | 6 | |
7 | - protected $jquery_code_for_compile=array (); |
|
8 | - protected $jquery_code_for_compile_at_last=array (); |
|
7 | + protected $jquery_code_for_compile=array(); |
|
8 | + protected $jquery_code_for_compile_at_last=array(); |
|
9 | 9 | |
10 | 10 | protected function _addToCompile($jsScript) { |
11 | 11 | $this->jquery_code_for_compile[]=$jsScript; |
@@ -15,29 +15,29 @@ discard block |
||
15 | 15 | * @param BaseGui $library |
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | - protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
|
19 | - if(isset($view)) |
|
18 | + protected function _compileLibrary(BaseGui $library, &$view=NULL) { |
|
19 | + if (isset($view)) |
|
20 | 20 | $library->compileHtml($this, $view); |
21 | 21 | if ($library->isAutoCompile()) { |
22 | 22 | $library->compile(true); |
23 | 23 | } |
24 | 24 | } |
25 | 25 | |
26 | - protected function defer($script){ |
|
26 | + protected function defer($script) { |
|
27 | 27 | $result="window.defer=function (method) {if (window.jQuery) method(); else setTimeout(function() { defer(method) }, 50);};"; |
28 | 28 | $result.="window.defer(function(){".$script."})"; |
29 | 29 | return $result; |
30 | 30 | } |
31 | 31 | |
32 | - protected function ready($script){ |
|
32 | + protected function ready($script) { |
|
33 | 33 | $result='$(document).ready(function() {'."\n"; |
34 | 34 | $result.=$script.'})'; |
35 | 35 | return $result; |
36 | 36 | } |
37 | 37 | |
38 | 38 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | - $input= preg_replace( |
|
39 | + if (trim($input)==="") return $input; |
|
40 | + $input=preg_replace( |
|
41 | 41 | array( |
42 | 42 | // Remove comment(s) |
43 | 43 | '#\s*("(?:[^"\\\]++|\\\.)*+"|\'(?:[^\'\\\\]++|\\\.)*+\')\s*|\s*\/\*(?!\!|@cc_on)(?>[\s\S]*?\*\/)\s*|\s*(?<![\:\=])\/\/.*(?=[\n\r]|$)|^\s*|\s*$#', |
@@ -16,8 +16,9 @@ discard block |
||
16 | 16 | * @param mixed $view |
17 | 17 | */ |
18 | 18 | protected function _compileLibrary(BaseGui $library, &$view=NULL){ |
19 | - if(isset($view)) |
|
20 | - $library->compileHtml($this, $view); |
|
19 | + if(isset($view)) { |
|
20 | + $library->compileHtml($this, $view); |
|
21 | + } |
|
21 | 22 | if ($library->isAutoCompile()) { |
22 | 23 | $library->compile(true); |
23 | 24 | } |
@@ -36,7 +37,9 @@ discard block |
||
36 | 37 | } |
37 | 38 | |
38 | 39 | protected function minify($input) { |
39 | - if(trim($input) === "") return $input; |
|
40 | + if(trim($input) === "") { |
|
41 | + return $input; |
|
42 | + } |
|
40 | 43 | $input= preg_replace( |
41 | 44 | array( |
42 | 45 | // Remove comment(s) |
@@ -32,7 +32,7 @@ discard block |
||
32 | 32 | $retour.="var self=this;\n"; |
33 | 33 | if($hasLoader===true && JString::isNotNull($responseElement)){ |
34 | 34 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
35 | - }elseif($hasLoader==="internal"){ |
|
35 | + } elseif($hasLoader==="internal"){ |
|
36 | 36 | $retour.="\n$(this).addClass('loading');"; |
37 | 37 | } |
38 | 38 | $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
@@ -49,8 +49,9 @@ discard block |
||
49 | 49 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data, textStatus, jqXHR ) {\n"; |
50 | 50 | $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader,($historize?$originalSelector:null))."});\n"; |
51 | 51 | $retour=$this->_addJsCondition($jsCondition,$retour); |
52 | - if ($immediatly) |
|
53 | - $this->jquery_code_for_compile[]=$retour; |
|
52 | + if ($immediatly) { |
|
53 | + $this->jquery_code_for_compile[]=$retour; |
|
54 | + } |
|
54 | 55 | return $retour; |
55 | 56 | } |
56 | 57 | |
@@ -86,12 +87,13 @@ discard block |
||
86 | 87 | if(JString::isNotNull($attr)){ |
87 | 88 | if ($attr==="value"){ |
88 | 89 | $retour.="url=url+'".$slash."'+$(this).val();\n"; |
89 | - }elseif ($attr==="html"){ |
|
90 | + } elseif ($attr==="html"){ |
|
90 | 91 | $retour.="url=url+'".$slash."'+$(this).html();\n"; |
91 | - }elseif(\substr($attr, 0,3)==="js:"){ |
|
92 | + } elseif(\substr($attr, 0,3)==="js:"){ |
|
92 | 93 | $retour.="url=url+'".$slash."'+".\substr($attr, 3).";\n"; |
93 | - }elseif($attr!==null && $attr!=="") |
|
94 | - $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
94 | + } elseif($attr!==null && $attr!=="") { |
|
95 | + $retour.="url=url+'".$slash."'+($(this).attr('".$attr."')||'');\n"; |
|
96 | + } |
|
95 | 97 | } |
96 | 98 | return $retour; |
97 | 99 | } |
@@ -111,13 +113,14 @@ discard block |
||
111 | 113 | if (JString::isNotNull($responseElement)) { |
112 | 114 | if(isset($ajaxTransition)){ |
113 | 115 | $call=$this->setAjaxDataCall($ajaxTransition); |
114 | - }elseif(isset($this->ajaxTransition)){ |
|
116 | + } elseif(isset($this->ajaxTransition)){ |
|
115 | 117 | $call=$this->ajaxTransition; |
116 | 118 | } |
117 | - if(\is_callable($call)) |
|
118 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
119 | - else |
|
120 | - $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
119 | + if(\is_callable($call)) { |
|
120 | + $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
121 | + } else { |
|
122 | + $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
|
123 | + } |
|
121 | 124 | } |
122 | 125 | if(isset($history)){ |
123 | 126 | if($this->params["autoActiveLinks"]){ |
@@ -140,8 +143,9 @@ discard block |
||
140 | 143 | } |
141 | 144 | |
142 | 145 | protected function _correctAjaxUrl($url) { |
143 | - if ($url!=="/" && JString::endsWith($url, "/")===true) |
|
144 | - $url=substr($url, 0, strlen($url)-1); |
|
146 | + if ($url!=="/" && JString::endsWith($url, "/")===true) { |
|
147 | + $url=substr($url, 0, strlen($url)-1); |
|
148 | + } |
|
145 | 149 | if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
146 | 150 | $url=$this->getUrl($url); |
147 | 151 | } |
@@ -161,8 +165,9 @@ discard block |
||
161 | 165 | public static function _implodeParams($parameters){ |
162 | 166 | $allParameters=[]; |
163 | 167 | foreach ($parameters as $params){ |
164 | - if(isset($params)) |
|
165 | - $allParameters[]=self::_correctParams($params); |
|
168 | + if(isset($params)) { |
|
169 | + $allParameters[]=self::_correctParams($params); |
|
170 | + } |
|
166 | 171 | } |
167 | 172 | return \implode("+'&'+", $allParameters); |
168 | 173 | } |
@@ -188,8 +193,9 @@ discard block |
||
188 | 193 | |
189 | 194 | protected function setDefaultParameters(&$parameters,$default){ |
190 | 195 | foreach ($default as $k=>$v){ |
191 | - if(!isset($parameters[$k])) |
|
192 | - $parameters[$k]=$v; |
|
196 | + if(!isset($parameters[$k])) { |
|
197 | + $parameters[$k]=$v; |
|
198 | + } |
|
193 | 199 | } |
194 | 200 | } |
195 | 201 | |
@@ -307,7 +313,7 @@ discard block |
||
307 | 313 | if($context===null){ |
308 | 314 | $parent="$('".$maskSelector."').parent()"; |
309 | 315 | $newElm = "$('#'+newId)"; |
310 | - }else{ |
|
316 | + } else{ |
|
311 | 317 | $parent=$context; |
312 | 318 | $newElm = $context.".find('#'+newId)"; |
313 | 319 | } |
@@ -533,7 +539,7 @@ discard block |
||
533 | 539 | $retour.="var self=this;\n"; |
534 | 540 | if($hasLoader===true){ |
535 | 541 | $this->addLoading($retour, $responseElement,$ajaxLoader); |
536 | - }elseif($hasLoader==="internal"){ |
|
542 | + } elseif($hasLoader==="internal"){ |
|
537 | 543 | $retour.="\n$(this).addClass('loading');"; |
538 | 544 | } |
539 | 545 | $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
@@ -551,8 +557,9 @@ discard block |
||
551 | 557 | $retour.="$('#".$form."').submit();\n"; |
552 | 558 | } |
553 | 559 | $retour=$this->_addJsCondition($jsCondition, $retour); |
554 | - if ($immediatly) |
|
555 | - $this->jquery_code_for_compile[]=$retour; |
|
560 | + if ($immediatly) { |
|
561 | + $this->jquery_code_for_compile[]=$retour; |
|
562 | + } |
|
556 | 563 | return $retour; |
557 | 564 | } |
558 | 565 |
@@ -17,11 +17,11 @@ discard block |
||
17 | 17 | protected $ajaxLoader="<div class=\"ui active centered inline text loader\">Loading</div>"; |
18 | 18 | |
19 | 19 | abstract public function getUrl($url); |
20 | - abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false,$immediatly=true); |
|
21 | - abstract public function interval($jsCode,$time,$globalName=null,$immediatly=true); |
|
20 | + abstract public function _add_event($element, $js, $event, $preventDefault=false, $stopPropagation=false, $immediatly=true); |
|
21 | + abstract public function interval($jsCode, $time, $globalName=null, $immediatly=true); |
|
22 | 22 | |
23 | - protected function _ajax($method,$url,$responseElement="",$parameters=[]) { |
|
24 | - if(isset($this->params["ajax"])){ |
|
23 | + protected function _ajax($method, $url, $responseElement="", $parameters=[]) { |
|
24 | + if (isset($this->params["ajax"])) { |
|
25 | 25 | extract($this->params["ajax"]); |
26 | 26 | } |
27 | 27 | extract($parameters); |
@@ -31,109 +31,109 @@ discard block |
||
31 | 31 | $originalSelector=$responseElement; |
32 | 32 | $responseElement=$this->_getResponseElement($responseElement); |
33 | 33 | $retour.="var self=this;\n"; |
34 | - if($hasLoader===true && JString::isNotNull($responseElement)){ |
|
35 | - $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
36 | - }elseif($hasLoader==="internal"){ |
|
34 | + if ($hasLoader===true && JString::isNotNull($responseElement)) { |
|
35 | + $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
36 | + }elseif ($hasLoader==="internal") { |
|
37 | 37 | $retour.="\n$(this).addClass('loading');"; |
38 | 38 | } |
39 | - $ajaxParameters=["url"=>"url","method"=>"'".\strtoupper($method)."'"]; |
|
39 | + $ajaxParameters=["url"=>"url", "method"=>"'".\strtoupper($method)."'"]; |
|
40 | 40 | |
41 | - $ajaxParameters["async"]=($async?"true":"false"); |
|
41 | + $ajaxParameters["async"]=($async ? "true" : "false"); |
|
42 | 42 | |
43 | - if(isset($params)){ |
|
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,$hasLoader,($historize?$originalSelector:null))."});\n"; |
|
52 | - $retour=$this->_addJsCondition($jsCondition,$retour); |
|
51 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader, ($historize ? $originalSelector : null))."});\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 onPopstate(){ |
|
100 | + protected function onPopstate() { |
|
101 | 101 | return "window.onpopstate = function(e){if(e.state){var target=e.state.jqueryDone;$(e.state.selector)[target](e.state.html);}};"; |
102 | 102 | } |
103 | 103 | |
104 | - protected function autoActiveLinks($previousURL="window.location.href"){ |
|
105 | - $result= "\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
104 | + protected function autoActiveLinks($previousURL="window.location.href") { |
|
105 | + $result="\nfunction getHref(url) { return \$('a').filter(function(){return \$(this).prop('href') == url; });}"; |
|
106 | 106 | $result.="\nvar myurl={$previousURL};if(window._previousURL) getHref(window._previousURL).removeClass('active');getHref(myurl).addClass('active');window._previousURL=myurl;"; |
107 | 107 | return $result; |
108 | 108 | } |
109 | 109 | |
110 | - protected function _getOnAjaxDone($responseElement,$jqueryDone,$ajaxTransition,$jsCallback,$hasLoader=false,$history=null){ |
|
111 | - $retour="";$call=null; |
|
110 | + protected function _getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader=false, $history=null) { |
|
111 | + $retour=""; $call=null; |
|
112 | 112 | if (JString::isNotNull($responseElement)) { |
113 | - if(isset($ajaxTransition)){ |
|
113 | + if (isset($ajaxTransition)) { |
|
114 | 114 | $call=$this->setAjaxDataCall($ajaxTransition); |
115 | - }elseif(isset($this->ajaxTransition)){ |
|
115 | + }elseif (isset($this->ajaxTransition)) { |
|
116 | 116 | $call=$this->ajaxTransition; |
117 | 117 | } |
118 | - if(\is_callable($call)) |
|
119 | - $retour="\t".$call($responseElement,$jqueryDone).";\n"; |
|
118 | + if (\is_callable($call)) |
|
119 | + $retour="\t".$call($responseElement, $jqueryDone).";\n"; |
|
120 | 120 | else |
121 | 121 | $retour="\t{$responseElement}.{$jqueryDone}( data );\n"; |
122 | 122 | } |
123 | - if(isset($history)){ |
|
124 | - if($this->params["autoActiveLinks"]){ |
|
123 | + if (isset($history)) { |
|
124 | + if ($this->params["autoActiveLinks"]) { |
|
125 | 125 | $retour.=$this->autoActiveLinks("url"); |
126 | 126 | } |
127 | 127 | $retour.="\nwindow.history.pushState({'html':data,'selector':".Javascript::prep_value($history).",'jqueryDone':'{$jqueryDone}'},'', url);"; |
128 | 128 | } |
129 | - if($hasLoader==="internal"){ |
|
129 | + if ($hasLoader==="internal") { |
|
130 | 130 | $retour.="\n$(self).removeClass('loading');"; |
131 | 131 | } |
132 | 132 | $retour.="\t".$jsCallback."\n"; |
133 | 133 | return $retour; |
134 | 134 | } |
135 | 135 | |
136 | - protected function _getResponseElement($responseElement){ |
|
136 | + protected function _getResponseElement($responseElement) { |
|
137 | 137 | if (JString::isNotNull($responseElement)) { |
138 | 138 | $responseElement=Javascript::prep_jquery_selector($responseElement); |
139 | 139 | } |
@@ -143,33 +143,33 @@ discard block |
||
143 | 143 | protected function _correctAjaxUrl($url) { |
144 | 144 | if ($url!=="/" && JString::endsWith($url, "/")===true) |
145 | 145 | $url=substr($url, 0, strlen($url)-1); |
146 | - if (strncmp($url, 'http://', 7)!=0&&strncmp($url, 'https://', 8)!=0) { |
|
146 | + if (strncmp($url, 'http://', 7)!=0 && strncmp($url, 'https://', 8)!=0) { |
|
147 | 147 | $url=$this->getUrl($url); |
148 | 148 | } |
149 | 149 | return $url; |
150 | 150 | } |
151 | 151 | |
152 | - public static function _correctParams($params){ |
|
153 | - if(JString::isNull($params)){ |
|
152 | + public static function _correctParams($params) { |
|
153 | + if (JString::isNull($params)) { |
|
154 | 154 | return ""; |
155 | 155 | } |
156 | - if(\preg_match("@^\{.*?\}$@", $params)){ |
|
156 | + if (\preg_match("@^\{.*?\}$@", $params)) { |
|
157 | 157 | return '$.param('.$params.')'; |
158 | 158 | } |
159 | 159 | return $params; |
160 | 160 | } |
161 | 161 | |
162 | - public static function _implodeParams($parameters){ |
|
162 | + public static function _implodeParams($parameters) { |
|
163 | 163 | $allParameters=[]; |
164 | - foreach ($parameters as $params){ |
|
165 | - if(isset($params)) |
|
164 | + foreach ($parameters as $params) { |
|
165 | + if (isset($params)) |
|
166 | 166 | $allParameters[]=self::_correctParams($params); |
167 | 167 | } |
168 | 168 | return \implode("+'&'+", $allParameters); |
169 | 169 | } |
170 | 170 | |
171 | - protected function addLoading(&$retour, $responseElement,$ajaxLoader=null) { |
|
172 | - if(!isset($ajaxLoader)){ |
|
171 | + protected function addLoading(&$retour, $responseElement, $ajaxLoader=null) { |
|
172 | + if (!isset($ajaxLoader)) { |
|
173 | 173 | $ajaxLoader=$this->ajaxLoader; |
174 | 174 | } |
175 | 175 | $loading_notifier='<div class="ajax-loader">'.$ajaxLoader.'</div>'; |
@@ -177,19 +177,19 @@ discard block |
||
177 | 177 | $retour.="\t\t{$responseElement}.prepend('{$loading_notifier}');\n"; |
178 | 178 | } |
179 | 179 | |
180 | - protected function setAjaxDataCall($params){ |
|
180 | + protected function setAjaxDataCall($params) { |
|
181 | 181 | $result=null; |
182 | - if(!\is_callable($params)){ |
|
183 | - $result=function ($responseElement,$jqueryDone="html") use($params){ |
|
184 | - return AjaxTransition::{$params}($responseElement,$jqueryDone); |
|
182 | + if (!\is_callable($params)) { |
|
183 | + $result=function($responseElement, $jqueryDone="html") use($params){ |
|
184 | + return AjaxTransition::{$params}($responseElement, $jqueryDone); |
|
185 | 185 | }; |
186 | 186 | } |
187 | 187 | return $result; |
188 | 188 | } |
189 | 189 | |
190 | - protected function setDefaultParameters(&$parameters,$default){ |
|
191 | - foreach ($default as $k=>$v){ |
|
192 | - if(!isset($parameters[$k])) |
|
190 | + protected function setDefaultParameters(&$parameters, $default) { |
|
191 | + foreach ($default as $k=>$v) { |
|
192 | + if (!isset($parameters[$k])) |
|
193 | 193 | $parameters[$k]=$v; |
194 | 194 | } |
195 | 195 | } |
@@ -203,8 +203,8 @@ discard block |
||
203 | 203 | * @param string $url The url of the request |
204 | 204 | * @param string $responseElement selector of the HTML element displaying the answer |
205 | 205 | */ |
206 | - private function _get($url, $responseElement="",$parameters=[]) { |
|
207 | - return $this->_ajax("get", $url,$responseElement,$parameters); |
|
206 | + private function _get($url, $responseElement="", $parameters=[]) { |
|
207 | + return $this->_ajax("get", $url, $responseElement, $parameters); |
|
208 | 208 | } |
209 | 209 | |
210 | 210 | /** |
@@ -213,9 +213,9 @@ discard block |
||
213 | 213 | * @param string $responseElement selector of the HTML element displaying the answer |
214 | 214 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
215 | 215 | */ |
216 | - public function get($url, $responseElement="",$parameters=[]) { |
|
216 | + public function get($url, $responseElement="", $parameters=[]) { |
|
217 | 217 | $parameters["immediatly"]=true; |
218 | - return $this->_get($url,$responseElement,$parameters); |
|
218 | + return $this->_get($url, $responseElement, $parameters); |
|
219 | 219 | } |
220 | 220 | |
221 | 221 | /** |
@@ -225,9 +225,9 @@ discard block |
||
225 | 225 | * @param string $responseElement selector of the HTML element displaying the answer |
226 | 226 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
227 | 227 | */ |
228 | - public function ajax($method,$url, $responseElement="", $parameters=[]) { |
|
228 | + public function ajax($method, $url, $responseElement="", $parameters=[]) { |
|
229 | 229 | $parameters["immediatly"]=true; |
230 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
230 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
231 | 231 | } |
232 | 232 | |
233 | 233 | /** |
@@ -239,8 +239,8 @@ discard block |
||
239 | 239 | * @param array $parameters The ajax parameters, default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
240 | 240 | * @return string |
241 | 241 | */ |
242 | - public function ajaxInterval($method,$url, $interval,$globalName=null,$responseElement="", $parameters=[]){ |
|
243 | - return $this->interval($this->ajaxDeferred($method, $url,$responseElement,$parameters), $interval,$globalName); |
|
242 | + public function ajaxInterval($method, $url, $interval, $globalName=null, $responseElement="", $parameters=[]) { |
|
243 | + return $this->interval($this->ajaxDeferred($method, $url, $responseElement, $parameters), $interval, $globalName); |
|
244 | 244 | } |
245 | 245 | |
246 | 246 | /** |
@@ -250,9 +250,9 @@ discard block |
||
250 | 250 | * @param string $responseElement selector of the HTML element displaying the answer |
251 | 251 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
252 | 252 | */ |
253 | - public function ajaxDeferred($method,$url, $responseElement="", $parameters=[]) { |
|
253 | + public function ajaxDeferred($method, $url, $responseElement="", $parameters=[]) { |
|
254 | 254 | $parameters["immediatly"]=false; |
255 | - return $this->_ajax($method,$url,$responseElement,$parameters); |
|
255 | + return $this->_ajax($method, $url, $responseElement, $parameters); |
|
256 | 256 | } |
257 | 257 | |
258 | 258 | /** |
@@ -261,8 +261,8 @@ discard block |
||
261 | 261 | * @param string $method Method used |
262 | 262 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
263 | 263 | */ |
264 | - private function _json($url, $method="get",$parameters=[]) { |
|
265 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
264 | + private function _json($url, $method="get", $parameters=[]) { |
|
265 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
266 | 266 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
267 | 267 | $context=isset($parameters['context']) ? $parameters['context'] : "document"; |
268 | 268 | $retour="\tdata=($.isPlainObject(data))?data:JSON.parse(data);\t".$jsCallback.";" |
@@ -270,7 +270,7 @@ discard block |
||
270 | 270 | ."if($('#'+key,".$context.").length){ if($('#'+key,".$context.").is('[value]')) { $('#'+key,".$context.").val(data[key]);} else { $('#'+key,".$context.").html(data[key]); }}};\n"; |
271 | 271 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
272 | 272 | $parameters["jsCallback"]=$retour; |
273 | - return $this->_ajax($method, $url,null,$parameters); |
|
273 | + return $this->_ajax($method, $url, null, $parameters); |
|
274 | 274 | } |
275 | 275 | |
276 | 276 | /** |
@@ -280,7 +280,7 @@ discard block |
||
280 | 280 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>"document","jsCondition"=>NULL,"headers"=>null,"immediatly"=>false) |
281 | 281 | */ |
282 | 282 | public function json($url, $method="get", $parameters=[]) { |
283 | - return $this->_json($url,$method,$parameters); |
|
283 | + return $this->_json($url, $method, $parameters); |
|
284 | 284 | } |
285 | 285 | |
286 | 286 | /** |
@@ -291,9 +291,9 @@ discard block |
||
291 | 291 | * @param string $method default get |
292 | 292 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","immediatly"=>true) |
293 | 293 | */ |
294 | - public function jsonOn($event,$element, $url,$method="get",$parameters=array()) { |
|
295 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
296 | - return $this->_add_event($element, $this->jsonDeferred($url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
294 | + public function jsonOn($event, $element, $url, $method="get", $parameters=array()) { |
|
295 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
296 | + return $this->_add_event($element, $this->jsonDeferred($url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
297 | 297 | } |
298 | 298 | |
299 | 299 | /** |
@@ -304,7 +304,7 @@ discard block |
||
304 | 304 | */ |
305 | 305 | public function jsonDeferred($url, $method="get", $parameters=[]) { |
306 | 306 | $parameters["immediatly"]=false; |
307 | - return $this->_json($url,$method,$parameters); |
|
307 | + return $this->_json($url, $method, $parameters); |
|
308 | 308 | } |
309 | 309 | |
310 | 310 | /** |
@@ -315,27 +315,27 @@ discard block |
||
315 | 315 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
316 | 316 | */ |
317 | 317 | private function _jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
318 | - $parameters=\array_merge($parameters,["hasLoader"=>false]); |
|
318 | + $parameters=\array_merge($parameters, ["hasLoader"=>false]); |
|
319 | 319 | $rowClass=isset($parameters['rowClass']) ? $parameters['rowClass'] : "_json"; |
320 | 320 | $jsCallback=isset($parameters['jsCallback']) ? $parameters['jsCallback'] : ""; |
321 | 321 | $context=isset($parameters['context']) ? $parameters['context'] : null; |
322 | - if($context===null){ |
|
322 | + if ($context===null) { |
|
323 | 323 | $parent="$('".$maskSelector."').parent()"; |
324 | - $newElm = "$('#'+newId)"; |
|
325 | - }else{ |
|
324 | + $newElm="$('#'+newId)"; |
|
325 | + } else { |
|
326 | 326 | $parent=$context; |
327 | - $newElm = $context.".find('#'+newId)"; |
|
327 | + $newElm=$context.".find('#'+newId)"; |
|
328 | 328 | } |
329 | 329 | $appendTo="\t\tnewElm.appendTo(".$parent.");\n"; |
330 | 330 | $retour=$parent.".find('.{$rowClass}').remove();"; |
331 | 331 | $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(); |
332 | 332 | 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"; |
333 | - $retour.= $appendTo; |
|
333 | + $retour.=$appendTo; |
|
334 | 334 | $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"; |
335 | 335 | $retour.="\t$(document).trigger('jsonReady',[data]);\n"; |
336 | 336 | $retour.="\t".$jsCallback; |
337 | 337 | $parameters["jsCallback"]=$retour; |
338 | - return $this->_ajax($method, $url,null,$parameters); |
|
338 | + return $this->_ajax($method, $url, null, $parameters); |
|
339 | 339 | } |
340 | 340 | |
341 | 341 | /** |
@@ -346,7 +346,7 @@ discard block |
||
346 | 346 | * @param array $parameters default : array("params"=>"{}","jsCallback"=>NULL,"attr"=>"id","context"=>null,"jsCondition"=>NULL,"headers"=>null,"immediatly"=>false,"rowClass"=>"_json") |
347 | 347 | */ |
348 | 348 | public function jsonArray($maskSelector, $url, $method="get", $parameters=[]) { |
349 | - return $this->_jsonArray($maskSelector, $url,$method,$parameters); |
|
349 | + return $this->_jsonArray($maskSelector, $url, $method, $parameters); |
|
350 | 350 | } |
351 | 351 | |
352 | 352 | /** |
@@ -369,9 +369,9 @@ discard block |
||
369 | 369 | * @param string $method Method used, default : get |
370 | 370 | * @param array $parameters default : array("preventDefault"=>true,"stopPropagation"=>true,"jsCallback"=>NULL,"attr"=>"id","params"=>"{}","method"=>"get","rowClass"=>"_json","immediatly"=>true) |
371 | 371 | */ |
372 | - public function jsonArrayOn($event,$element,$maskSelector, $url,$method="get",$parameters=array()) { |
|
373 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
374 | - return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector,$url,$method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
372 | + public function jsonArrayOn($event, $element, $maskSelector, $url, $method="get", $parameters=array()) { |
|
373 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
374 | + return $this->_add_event($element, $this->jsonArrayDeferred($maskSelector, $url, $method, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
375 | 375 | } |
376 | 376 | |
377 | 377 | /** |
@@ -383,7 +383,7 @@ discard block |
||
383 | 383 | */ |
384 | 384 | public function getDeferred($url, $responseElement="", $parameters=[]) { |
385 | 385 | $parameters["immediatly"]=false; |
386 | - return $this->_get($url, $responseElement,$parameters); |
|
386 | + return $this->_get($url, $responseElement, $parameters); |
|
387 | 387 | } |
388 | 388 | |
389 | 389 | /** |
@@ -396,8 +396,8 @@ discard block |
||
396 | 396 | * @param array $parameters 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) |
397 | 397 | */ |
398 | 398 | public function getOn($event, $element, $url, $responseElement="", $parameters=array()) { |
399 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
400 | - return $this->_add_event($element, $this->getDeferred($url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
399 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
400 | + return $this->_add_event($element, $this->getDeferred($url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
401 | 401 | } |
402 | 402 | |
403 | 403 | /** |
@@ -410,8 +410,8 @@ discard block |
||
410 | 410 | * @param array $parameters 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) |
411 | 411 | */ |
412 | 412 | public function ajaxOn($event, $element, $url, $responseElement="", $parameters=array()) { |
413 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true,"method"=>"get"]); |
|
414 | - return $this->_add_event($element, $this->ajaxDeferred($parameters["method"],$url,$responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
413 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true, "method"=>"get"]); |
|
414 | + return $this->_add_event($element, $this->ajaxDeferred($parameters["method"], $url, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
415 | 415 | } |
416 | 416 | |
417 | 417 | /** |
@@ -445,15 +445,15 @@ discard block |
||
445 | 445 | * @param array $parameters 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) |
446 | 446 | * @return $this |
447 | 447 | */ |
448 | - public function getHref($element,$responseElement="",$parameters=array()){ |
|
448 | + public function getHref($element, $responseElement="", $parameters=array()) { |
|
449 | 449 | $parameters["attr"]="href"; |
450 | - if(JString::isNull($responseElement)){ |
|
450 | + if (JString::isNull($responseElement)) { |
|
451 | 451 | $responseElement='%$(self).attr("data-target")%'; |
452 | 452 | } |
453 | - if(!isset($parameters["historize"])){ |
|
453 | + if (!isset($parameters["historize"])) { |
|
454 | 454 | $parameters["historize"]=true; |
455 | 455 | } |
456 | - return $this->getOnClick($element, "",$responseElement,$parameters); |
|
456 | + return $this->getOnClick($element, "", $responseElement, $parameters); |
|
457 | 457 | } |
458 | 458 | |
459 | 459 | /** |
@@ -463,20 +463,20 @@ discard block |
||
463 | 463 | * @param array $parameters 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) |
464 | 464 | * @return $this |
465 | 465 | */ |
466 | - public function postHref($element,$responseElement="",$parameters=array()){ |
|
466 | + public function postHref($element, $responseElement="", $parameters=array()) { |
|
467 | 467 | $parameters["attr"]="href"; |
468 | - if(JString::isNull($responseElement)){ |
|
468 | + if (JString::isNull($responseElement)) { |
|
469 | 469 | $responseElement='%$(this).attr("data-target")%'; |
470 | 470 | } |
471 | - if(!isset($parameters["historize"])){ |
|
471 | + if (!isset($parameters["historize"])) { |
|
472 | 472 | $parameters["historize"]=true; |
473 | 473 | } |
474 | - return $this->postOnClick($element, "","{}",$responseElement,$parameters); |
|
474 | + return $this->postOnClick($element, "", "{}", $responseElement, $parameters); |
|
475 | 475 | } |
476 | 476 | |
477 | - private function _post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
477 | + private function _post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
478 | 478 | $parameters["params"]=$params; |
479 | - return $this->_ajax("POST", $url,$responseElement,$parameters); |
|
479 | + return $this->_ajax("POST", $url, $responseElement, $parameters); |
|
480 | 480 | } |
481 | 481 | |
482 | 482 | /** |
@@ -486,8 +486,8 @@ discard block |
||
486 | 486 | * @param string $params JSON parameters |
487 | 487 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
488 | 488 | */ |
489 | - public function post($url, $params="{}",$responseElement="", $parameters=[]) { |
|
490 | - return $this->_post($url, $params,$responseElement, $parameters); |
|
489 | + public function post($url, $params="{}", $responseElement="", $parameters=[]) { |
|
490 | + return $this->_post($url, $params, $responseElement, $parameters); |
|
491 | 491 | } |
492 | 492 | |
493 | 493 | /** |
@@ -498,7 +498,7 @@ discard block |
||
498 | 498 | * @param string $responseElement selector of the HTML element displaying the answer |
499 | 499 | * @param array $parameters default : array("jsCallback"=>NULL,"attr"=>"id","hasLoader"=>true,"ajaxLoader"=>null,"immediatly"=>true,"jqueryDone"=>"html","ajaxTransition"=>null,"jsCondition"=>NULL,"headers"=>null,"historize"=>false) |
500 | 500 | */ |
501 | - public function postDeferred($url, $params="{}",$responseElement="", $parameters=[]) { |
|
501 | + public function postDeferred($url, $params="{}", $responseElement="", $parameters=[]) { |
|
502 | 502 | $parameters["immediatly"]=false; |
503 | 503 | return $this->_post($url, $params, $responseElement, $parameters); |
504 | 504 | } |
@@ -514,8 +514,8 @@ discard block |
||
514 | 514 | * @param array $parameters 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) |
515 | 515 | */ |
516 | 516 | public function postOn($event, $element, $url, $params="{}", $responseElement="", $parameters=array()) { |
517 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
518 | - return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
517 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
518 | + return $this->_add_event($element, $this->postDeferred($url, $params, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
519 | 519 | } |
520 | 520 | |
521 | 521 | /** |
@@ -532,33 +532,33 @@ discard block |
||
532 | 532 | } |
533 | 533 | |
534 | 534 | private function _postForm($url, $form, $responseElement, $parameters=[]) { |
535 | - if(isset($this->params["ajax"])){ |
|
535 | + if (isset($this->params["ajax"])) { |
|
536 | 536 | extract($this->params["ajax"]); |
537 | 537 | } |
538 | - $params="{}";$validation=false; |
|
538 | + $params="{}"; $validation=false; |
|
539 | 539 | \extract($parameters); |
540 | - $async=($async)?"true":"false"; |
|
540 | + $async=($async) ? "true" : "false"; |
|
541 | 541 | $jsCallback=isset($jsCallback) ? $jsCallback : ""; |
542 | 542 | $retour=$this->_getAjaxUrl($url, $attr); |
543 | 543 | $retour.="\n$('#".$form."').trigger('ajaxSubmit');"; |
544 | 544 | $retour.="\nvar params=$('#".$form."').serialize();\n"; |
545 | - if(isset($params)){ |
|
545 | + if (isset($params)) { |
|
546 | 546 | $retour.="params+='&'+".self::_correctParams($params).";\n"; |
547 | 547 | } |
548 | 548 | $responseElement=$this->_getResponseElement($responseElement); |
549 | 549 | $retour.="var self=this;\n"; |
550 | - if($hasLoader===true){ |
|
551 | - $this->addLoading($retour, $responseElement,$ajaxLoader); |
|
552 | - }elseif($hasLoader==="internal"){ |
|
550 | + if ($hasLoader===true) { |
|
551 | + $this->addLoading($retour, $responseElement, $ajaxLoader); |
|
552 | + }elseif ($hasLoader==="internal") { |
|
553 | 553 | $retour.="\n$(this).addClass('loading');"; |
554 | 554 | } |
555 | - $ajaxParameters=["url"=>"url","method"=>"'POST'","data"=>"params","async"=>$async]; |
|
556 | - if(isset($headers)){ |
|
555 | + $ajaxParameters=["url"=>"url", "method"=>"'POST'", "data"=>"params", "async"=>$async]; |
|
556 | + if (isset($headers)) { |
|
557 | 557 | $ajaxParameters["headers"]=$headers; |
558 | 558 | } |
559 | 559 | $this->createAjaxParameters($ajaxParameters, $parameters); |
560 | 560 | $retour.="$.ajax({".$this->implodeAjaxParameters($ajaxParameters)."}).done(function( data ) {\n"; |
561 | - $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone,$ajaxTransition,$jsCallback,$hasLoader)."});\n"; |
|
561 | + $retour.=$this->_getOnAjaxDone($responseElement, $jqueryDone, $ajaxTransition, $jsCallback, $hasLoader)."});\n"; |
|
562 | 562 | |
563 | 563 | if ($validation) { |
564 | 564 | $retour="$('#".$form."').validate({submitHandler: function(form) { |
@@ -608,8 +608,8 @@ discard block |
||
608 | 608 | * @param array $parameters 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) |
609 | 609 | */ |
610 | 610 | public function postFormOn($event, $element, $url, $form, $responseElement="", $parameters=array()) { |
611 | - $this->setDefaultParameters($parameters, ["preventDefault"=>true,"stopPropagation"=>true,"immediatly"=>true]); |
|
612 | - return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement,$parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"],$parameters["immediatly"]); |
|
611 | + $this->setDefaultParameters($parameters, ["preventDefault"=>true, "stopPropagation"=>true, "immediatly"=>true]); |
|
612 | + return $this->_add_event($element, $this->postFormDeferred($url, $form, $responseElement, $parameters), $event, $parameters["preventDefault"], $parameters["stopPropagation"], $parameters["immediatly"]); |
|
613 | 613 | } |
614 | 614 | |
615 | 615 | /** |
@@ -10,12 +10,12 @@ |
||
10 | 10 | * @author jc |
11 | 11 | * |
12 | 12 | */ |
13 | -class Visibility extends SimpleSemExtComponent{ |
|
13 | +class Visibility extends SimpleSemExtComponent { |
|
14 | 14 | |
15 | 15 | public function __construct(JsUtils $js) { |
16 | 16 | parent::__construct($js); |
17 | 17 | $this->uiName="visibility"; |
18 | - $this->params=["once"=>false,"observeChanges"=>true]; |
|
18 | + $this->params=["once"=>false, "observeChanges"=>true]; |
|
19 | 19 | } |
20 | 20 | |
21 | 21 | public function setOnce($value=false) { |