Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

1 files changed, 12 insertions, 4 deletions

diff --git a/plugins/ExampleUI/Controller.php b/plugins/ExampleUI/Controller.php
index 201610f7e7..dc1415b411 100644
--- a/plugins/ExampleUI/Controller.php
+++ b/plugins/ExampleUI/Controller.php
@@ -26,12 +26,20 @@ class Controller extends \Piwik\Controller
         $view->translations['label'] = "Hour of day";
         $view->filter_sort_column = 'label';
         $view->filter_sort_order = 'asc';
-        $view->graph_limit = 24;
         $view->filter_limit = 24;
         $view->show_exclude_low_population = false;
         $view->show_table_all_columns = false;
-        $view->disable_row_evolution = true;
         $view->y_axis_unit = '°C'; // useful if the user requests the bar graph
+        $view->visualization_properties->setForVisualization(
+            'Piwik\\Plugins\\CoreVisualizations\\Visualizations\\HtmlTable',
+            'disable_row_evolution',
+            true
+        );
+        $view->visualization_properties->setForVisualization(
+            'Piwik\\Plugins\\CoreVisualizations\\Visualizations\\JqplotGraph',
+            'max_graph_elements',
+            24
+        );
         echo $view->render();
     }
 
@@ -57,7 +65,7 @@ class Controller extends \Piwik\Controller
             'graphVerticalBar', 'ExampleUI.getTemperatures', $controllerAction = 'ExampleUI.barGraph');
         $view->translations['value'] = "Temperature";
         $view->y_axis_unit = '°C';
-        $view->graph_limit = 24;
+        $view->visualization_properties->max_graph_elements = 24;
         $view->show_footer = false;
         echo $view->render();
     }
@@ -68,7 +76,7 @@ class Controller extends \Piwik\Controller
             'graphPie', 'ExampleUI.getPlanetRatios', $controllerAction = 'ExampleUI.pieGraph');
         $view->columns_to_display = array('value');
         $view->translations['value'] = "times the diameter of Earth";
-        $view->graph_limit = 10;
+        $view->visualization_properties->max_graph_elements = 10;
         $view->show_footer_icons = false;
         echo $view->render();
     }