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

Fix for issue #338 #348

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

Fix for issue #338 #348

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c557ba5
Fix to allow function names as callbacks
Javier-Rotelli Sep 30, 2015
cd5b2f2
half of the tests are running now
Javier-Rotelli Sep 30, 2015
7de6601
Fixes #253
Oct 6, 2015
7a24b1f
Fixes #253
Oct 6, 2015
1f1e512
progress, only one test remains to be fixed
Javier-Rotelli Oct 7, 2015
a3f9de1
Fixes #342
Oct 10, 2015
c6fb456
all tests green, but i'm not sure if the solution is a good one
Javier-Rotelli Oct 16, 2015
ca91cb6
added test for #338
Javier-Rotelli Oct 23, 2015
709bd22
fix #338
Javier-Rotelli Oct 26, 2015
2243a40
Fix to allow function names as callbacks
Javier-Rotelli Sep 30, 2015
f1e9a61
all tests green, but i'm not sure if the solution is a good one
Javier-Rotelli Oct 16, 2015
9fae926
fix #338
Javier-Rotelli Oct 26, 2015
33ba1a7
Merge branch 'develop' of github.com:MG-Web/Datatable into develop
Javier-Rotelli Oct 26, 2015
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
30 changes: 24 additions & 6 deletions src/Chumper/Datatable/Table.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ public function getViewParameters()
$this->createMapping();
}
return 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 @@ -325,7 +325,7 @@ public function noScript()
return $this;
}

private function convertData($options) {
private function convertData($options, $callbacks = []) {
$is_obj = false;
$first = true;
$data = "";
Expand All @@ -342,18 +342,36 @@ private function convertData($options) {
$data .= json_encode($k) . ":";
}
if (is_string($o)) {
if (@preg_match("#^\s*function\s*\([^\)]*#", $o)) {
$data .= $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);
$data .= $this->convertData([],$o);
} else {
$data .= json_encode($o);
}
}

}

if ($is_obj) {
Expand All @@ -377,7 +395,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