|
11 | 11 | function (cfg, $scope, $routeParams, $timeout, TimeSliderVoService, NavbarVoService, $window, SidebarTitleVoService, filteredMapUtilService, $rootElement, analyticsService) { |
12 | 12 | analyticsService.send(analyticsService.CONST.FILTEREDMAP_PAGE); |
13 | 13 | // define private variables |
14 | | - var oNavbarVoService, oTimeSliderVoService, bNodeSelected, bNoData, reloadOnlyForNode, reloadOnlyForLink, bLoadingPause = false, bIngRequest = true, bDoneRequest = false; |
| 14 | + var oNavbarVoService, oTimeSliderVoService, bNodeSelected, reloadOnlyForNode, reloadOnlyForLink, bLoadingPause = false, bIngRequest = true, bDoneRequest = false; |
15 | 15 |
|
16 | 16 | // initialize scope variables |
17 | 17 | $scope.hasScatter = false; |
18 | 18 | $window.htoScatter = {}; |
19 | | - bNoData = true; |
20 | 19 | reloadOnlyForNode = false; |
21 | 20 | reloadOnlyForLink = false; |
22 | 21 | $scope.sidebarLoading = false; |
|
91 | 90 |
|
92 | 91 | $scope.getMainContainerClass = function () { |
93 | 92 | return ""; |
94 | | - // return bNoData ? 'no-data' : ''; |
95 | 93 | }; |
96 | 94 |
|
97 | 95 | $scope.getInfoDetailsClass = function () { |
|
107 | 105 | return infoDetailsClass.join(' '); |
108 | 106 | }; |
109 | 107 |
|
110 | | - $scope.$on('serverMapDirective.hasData', function (event) { |
111 | | - bNoData = false; |
| 108 | + $scope.$on('serverMapDirective.hasData', function () { |
112 | 109 | $scope.sidebarLoading = false; |
113 | 110 | }); |
114 | | - |
115 | | - $scope.$on('serverMap.hasNoData', function (event) { |
116 | | - bNoData = true; |
| 111 | + |
| 112 | + $scope.$on('serverMapDirective.hasNoData', function () { |
117 | 113 | $scope.sidebarLoading = false; |
| 114 | + checkNextLoading(); |
118 | 115 | }); |
119 | 116 |
|
120 | 117 | $scope.$on('serverMapDirective.fetched', function (event, lastFetchedTimestamp, mapData) { |
|
144 | 141 | loadData(); |
145 | 142 | } |
146 | 143 | }); |
147 | | - $scope.$on('timeSliderDirective.moreClicked', function (event) { |
| 144 | + $scope.$on('timeSliderDirective.moreClicked', function () { |
148 | 145 | loadData(); |
149 | 146 | }); |
150 | | - |
| 147 | + |
151 | 148 | $scope.$on('serverMapDirective.nodeClicked', function (event, e, query, node, data) { |
152 | 149 | bNodeSelected = true; |
153 | 150 | var oSidebarTitleVoService = new SidebarTitleVoService(); |
|
0 commit comments