Skip to content
This repository was archived by the owner on Apr 17, 2019. It is now read-only.

Fix to allow function names as callbacks #339

Closed
wants to merge 1 commit into from
Closed

Fix to allow function names as callbacks #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 59 additions & 41 deletions src/Chumper/Datatable/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ public function render($view = null)
}

return View::make($this->table_view,array(
'options' => $this->convertData(array_merge($this->options, $this->callbacks)),
'options' => $this->convertData($this->options, $this->callbacks),
'values' => $this->customValues,
'data' => $this->data,
'columns' => array_combine($this->aliasColumns,$this->columns),
Expand All @@ -317,45 +317,63 @@ public function noScript()
return $this;
}

private function convertData($options) {
$is_obj = false;
$first = true;
$data = "";
foreach ($options as $k => $o) {
if ($first == true) {
if (!is_numeric($k)) {
$is_obj = true;
}
$first = false;
} else {
$data .= ",\n";
}
if (!is_numeric($k)) {
$data .= json_encode($k) . ":";
}
if (is_string($o)) {
if (@preg_match("#^\s*function\s*\([^\)]*#", $o)) {
$data .= $o;
} else {
$data .= json_encode($o);
}
} else {
if (is_array($o)) {
$data .= $this->convertData($o);
} else {
$data .= json_encode($o);
}
}
}

if ($is_obj) {
$data = "{ $data }";
} else {
$data = "[ $data ]";
}

return $data;
}
private function convertData($options, $callbacks = []) {
$is_obj = false;
$first = true;
$data = "";
foreach ($options as $k => $o) {
if ($first == true) {
if (!is_numeric($k)) {
$is_obj = true;
}
$first = false;
} else {
$data .= ",\n";
}
if (!is_numeric($k)) {
$data .= json_encode($k) . ":";
}
if (is_string($o)) {
$data .= json_encode($o);
} else {
if (is_array($o)) {
$data .= $this->convertData($o);
} else {
$data .= json_encode($o);
}
}
}

foreach($callbacks as $k => $o){
if ($first == true) {
if (!is_numeric($k)) {
$is_obj = true;
}
$first = false;
} else {
$data .= ",\n";
}
$data .= json_encode($k) . ":";
if (is_string($o)) {
$data .= $o;
} else {
if (is_array($o)) {
$data .= $this->convertData([],$o);
} else {
$data .= json_encode($o);
}
}

}

if ($is_obj) {
$data = "{ $data }";
} else {
$data = "[ $data ]";
}

return $data;
}

public function script($view = null)
{
Expand All @@ -369,7 +387,7 @@ public function script($view = null)
}

return View::make($this->script_view,array(
'options' => $this->convertData(array_merge($this->options, $this->callbacks)),
'options' => $this->convertData($this->options, $this->callbacks),
'id' => $this->idName,
));
}
Expand Down