Skip to content

Commit fcfed56

Browse files
committed
scrutinizer notation + aftercompile->before
1 parent b1701b9 commit fcfed56

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Ajax/JsUtils.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ public function config($config=NULL) {
167167
}
168168

169169
/**
170-
* @param array $params ['driver'=>'jquery','debug'=>true,'defer'=>false,'ajaxTransition'=>null,'afterCompileHtml'=>null]
170+
* @param array $params ['driver'=>'jquery','debug'=>true,'defer'=>false,'ajaxTransition'=>null,'beforeCompileHtml'=>null]
171171
* @param mixed $injected optional param for Symfony
172172
*/
173173
public function __construct($params=array(),$injected=NULL) {

Ajax/common/html/BaseHtml.php

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -189,18 +189,19 @@ public function setBsComponent($bsComponent) {
189189
}
190190

191191
protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
192-
}
193-
public function compile(JsUtils $js=NULL, &$view=NULL) {
194192
if(!$this->_compiled){
195193
if(isset($js)){
196-
$afterCompile=$js->getParam("afterCompileHtml");
197-
if(\is_callable($afterCompile)){
198-
$afterCompile($this,$js,$view);
194+
$beforeCompile=$js->getParam("beforeCompileHtml");
195+
if(\is_callable($beforeCompile)){
196+
$beforeCompile($this,$js,$view);
199197
}
200198
}
201-
$this->compile_once($js,$view);
202199
$this->_compiled=true;
203200
}
201+
}
202+
203+
public function compile(JsUtils $js=NULL, &$view=NULL) {
204+
$this->compile_once($js,$view);
204205
$result=$this->getTemplate($js);
205206
foreach ( $this as $key => $value ) {
206207
if (JString::startswith($key, "_") === false && $key !== "events") {

Ajax/semantic/html/collections/table/HtmlTable.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ public function compile(JsUtils $js=NULL, &$view=NULL) {
300300
}
301301

302302
protected function compile_once(JsUtils $js=NULL, &$view=NULL) {
303+
parent::compile_once($js,$view);
303304
if ($this->propertyContains("class", "sortable")) {
304305
$this->addEvent("execute", "$('#" . $this->identifier . "').tablesort().data('tablesort').sort($('th.default-sort'));");
305306
}

Ajax/semantic/widgets/dataform/DataForm.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,20 @@ protected function _generateContent($form){
6060
if($size===1){
6161
$i=-1;
6262
foreach ($values as $v){
63-
//$form->addField($v);
64-
$this->_generateFields($form, [$v], $headers, $i, $i+1, $wrappers);
63+
$this->_generateFields($form, [$v], $headers, $i, $wrappers);
6564
$i++;
6665
}
6766
}else{
6867
$separators[]=$count;
6968
for($i=0;$i<$size;$i++){
7069
$fields=\array_slice($values, $separators[$i]+1,$separators[$i+1]-$separators[$i]);
71-
$this->_generateFields($form, $fields, $headers, $separators[$i], $separators[$i+1], $wrappers);
70+
$this->_generateFields($form, $fields, $headers, $separators[$i], $wrappers);
7271
}
7372
}
7473
}
7574

76-
protected function _generateFields($form,$values,$headers,$sepFirst,$sepLast,$wrappers){
75+
protected function _generateFields($form,$values,$headers,$sepFirst,$wrappers){
7776
$wrapper=null;
78-
//$fields=\array_slice($values, $sepFirst+1,$sepLast-$sepFirst);
7977
if(isset($headers[$sepFirst+1]))
8078
$form->addHeader($headers[$sepFirst+1],4,true);
8179
if(isset($wrappers[$sepFirst+1])){

0 commit comments

Comments
 (0)