Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Steur <thomas.steur@gmail.com>2013-10-14 06:35:09 +0400
committerThomas Steur <thomas.steur@gmail.com>2013-10-14 06:35:09 +0400
commitdd12f1e82f7b38b7bf74e74420303572e4bfedb4 (patch)
treef67d0a2d14a41cf11548d112c74b028dbcf95167 /core/ViewDataTable.php
parentcf603f7e975766759a2f35f5c297b3e1e6db06fb (diff)
after data loaded function is no longer needed
Diffstat (limited to 'core/ViewDataTable.php')
-rw-r--r--core/ViewDataTable.php15
1 files changed, 2 insertions, 13 deletions
diff --git a/core/ViewDataTable.php b/core/ViewDataTable.php
index d749b7aa92..523b1214f2 100644
--- a/core/ViewDataTable.php
+++ b/core/ViewDataTable.php
@@ -416,7 +416,6 @@ class ViewDataTable
if ($name == 'translations'
|| $name == 'filters'
- || $name == 'after_data_loaded_functions'
) {
$this->vizConfig->$name = array_merge($this->vizConfig->$name, $value);
} else if ($name == 'related_reports') { // TODO: should process after (in overrideViewProperties)
@@ -828,8 +827,8 @@ class ViewDataTable
*/
private function getClientSidePropertiesToSet()
{
- // TODO
$result = array();
+
foreach ($this->getClientSideConfigProperties() as $name) {
if (property_exists($this->vizRequest, $name)) {
$result[$name] = $this->convertForJson($this->vizRequest->$name);
@@ -839,6 +838,7 @@ class ViewDataTable
$result[$name] = $this->convertForJson($this->vizConfig->visualization_properties->$name);
}
}
+
return $result;
}
@@ -1087,7 +1087,6 @@ class ViewDataTable
$this->loadDataTableFromAPI();
$this->postDataTableLoadedFromAPI($visualization);
- $this->executeAfterDataLoadedCallbacks();
$visualization->afterAllFilteresAreApplied($this->dataTable, $this->vizConfig, $this->vizRequest);
@@ -1134,16 +1133,6 @@ class ViewDataTable
return $view;
}
- private function executeAfterDataLoadedCallbacks()
- {
- if (!empty($this->after_data_loaded_functions)) {
-// TODO it is not defined and we can remove it anyway
- foreach ($this->after_data_loaded_functions as $callback) {
- $callback($this->dataTable, $this);
- }
- }
- }
-
private function getDefaultFooterIconsToShow()
{
$result = array();