valitydev/redash
14
0
Fork 0
mirror of https://github.com/valitydev/redash.git synced 2024-11-07 09:28:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #268 from EverythingMe/257-chart-editor

Browse Source 
[#257] chart editor: global series type
This commit is contained in:
Arik Fraimovich 2014-08-19 19:51:57 +03:00
commit c4877f254e
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rd_ui/app/scripts/visualizations/chart.js
View File

@ -33,7 +33,7 @@
$scope.chartSeries = []; $scope.chartSeries = [];
$scope.chartOptions = {}; $scope.chartOptions = {};
var reloadData = _.throttle(function(data) { var reloadData = function(data) {
if (!data || ($scope.queryResult && $scope.queryResult.getData()) == null) { if (!data || ($scope.queryResult && $scope.queryResult.getData()) == null) {
$scope.chartSeries.splice(0, $scope.chartSeries.length); $scope.chartSeries.splice(0, $scope.chartSeries.length);
} else { } else {
@ -49,8 +49,8 @@
} }
$scope.chartSeries.push(_.extend(s, additional)); $scope.chartSeries.push(_.extend(s, additional));
}); });
} };
}, 500); };
$scope.$watch('options', function (chartOptions) { $scope.$watch('options', function (chartOptions) {
if (chartOptions) { if (chartOptions) {
@ -144,7 +144,9 @@
// TODO: remove uneeded ones? // TODO: remove uneeded ones?
if (scope.visualization.options.seriesOptions == undefined) { if (scope.visualization.options.seriesOptions == undefined) {
scope.visualization.options.seriesOptions = {}; scope.visualization.options.seriesOptions = {
type: scope.globalSeriesType
};
}; };
_.each(scope.series, function(s, i) { _.each(scope.series, function(s, i) {