Commit b589e538 authored by Antonella Giachino's avatar Antonella Giachino
Browse files

Hidden popup on heatmap

parent 027d00e3
......@@ -68,7 +68,7 @@ angular.module('chartRendererModule')
scope.chartTemplate.CHART.COLORPALETTE.COLOR = angular.copy(scope.chartTemplate.CHART.COLORPALETTE.COLORCopy)
delete scope.chartTemplate.CHART.COLORPALETTE.COLORCopy
}
if(scope.chartTemplate.CHART.groupSeriesCateg && scope.chartConf.series.length > 0){
scope.chartConf.colorsCopy = angular.copy(scope.chartConf.colors);
if(scope.colorMap){
......@@ -88,9 +88,9 @@ angular.module('chartRendererModule')
scope.colorMap[scope.chartConf.series[i].name] = scope.chartConf.colors[i];
}
}
}
var renderObject = {};
renderObject.chartConf = scope.chartConf;
renderObject.element = element[0];
......@@ -99,9 +99,9 @@ angular.module('chartRendererModule')
renderObject.widgetData = scope.widgetData;
renderObject.chartTemplate = scope.chartTemplate.CHART;
if(selectionsAndParams){
renderObject.selectionsAndParams = selectionsAndParams;
renderObject.selectionsAndParams = selectionsAndParams;
}
scope.chartInitializer.renderChart(renderObject, jsonData);
}
}
......@@ -144,7 +144,7 @@ angular.module('chartRendererModule')
}else{
var transformedData = dataForSending;
if(isRealtime){
if(scope.chartInitializer.transformeData){
if(scope.chartInitializer && scope.chartInitializer.transformeData){
transformedData = scope.chartInitializer.transformeData(scope.widgetData,dataForSending);
}
}
......
......@@ -513,7 +513,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
}
//popup isn't shown with cluster and heatmap
if (($scope.selectedLayer && ($scope.selectedLayer.isCluster || $scope.selectedLayer.isHeatmap)) || !$scope.selectedLayer.hasShownDetails){
if ($scope.selectedLayer && ($scope.selectedLayer.isCluster || $scope.selectedLayer.isHeatmap || !$scope.selectedLayer.hasShownDetails)){
$scope.closer.onclick();
return;
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment