Merge pull request #1495 from spadgett/rootscope-event-cleanup

Merged by openshift-bot

Author: OpenShift Bot

app/scripts/directives/deploymentMetrics.js

@@ -464,7 +464,7 @@ angular.module('openshiftConsole')
           }
         };
 
-        $rootScope.$on('metrics.charts.resize', function(){
+        var unbindResizeHandler = $rootScope.$on('metrics.charts.resize', function(){
           MetricsCharts.redraw(chartByMetric);
         });
 
@@ -474,6 +474,11 @@ angular.module('openshiftConsole')
             intervalPromise = null;
           }
 
+          if (unbindResizeHandler) {
+            unbindResizeHandler();
+            unbindResizeHandler = null;
+          }
+
           angular.forEach(chartByMetric, function(chart) {
             chart.destroy();
           });

app/scripts/directives/eventsSidebar.js

@@ -24,7 +24,8 @@ angular.module('openshiftConsole')
           $scope.collapsed = true;
         };
 
-        $rootScope.$on('event.resource.highlight', function(evt, data) {
+        var messageHandlers = [];
+        messageHandlers.push($rootScope.$on('event.resource.highlight', function(evt, data) {
           var targetKind = _.get(data, 'kind');
           var targetName = _.get(data, 'metadata.name');
           if (!targetKind || !targetName) {
@@ -35,9 +36,9 @@ angular.module('openshiftConsole')
               $scope.highlightedEvents[targetKind + "/" + targetName] = true;
             }
           });
-        });
+        }));
 
-        $rootScope.$on('event.resource.clear-highlight', function(event, data) {
+        messageHandlers.push($rootScope.$on('event.resource.clear-highlight', function(event, data) {
           var targetKind = _.get(data, 'kind');
           var targetName = _.get(data, 'metadata.name');
           if (!targetKind || !targetName) {
@@ -48,10 +49,14 @@ angular.module('openshiftConsole')
               $scope.highlightedEvents[targetKind + "/" + targetName] = false;
             }
           });
-        });        
+        }));
 
         $scope.$on('$destroy', function() {
           DataService.unwatchAll(watches);
+          _.each(messageHandlers, function(unbind) {
+            unbind();
+          });
+          messageHandlers = null;
         });
       },
     };

app/scripts/directives/podMetrics.js

@@ -290,6 +290,10 @@ angular.module('openshiftConsole')
         var failureCount = 0;
 
         function metricsSucceeded() {
+          if (destroyed) {
+            return;
+          }
+
           // Reset the number of failures on a successful request.
           failureCount = 0;
 
@@ -519,7 +523,7 @@ angular.module('openshiftConsole')
           intervalPromise = $interval(update, MetricsCharts.getDefaultUpdateInterval(), false);
         });
 
-        $rootScope.$on('metrics.charts.resize', function() {
+        var unbindResizeHandler = $rootScope.$on('metrics.charts.resize', function() {
           MetricsCharts.redraw(donutByMetric);
           MetricsCharts.redraw(sparklineByMetric);
         });
@@ -530,6 +534,11 @@ angular.module('openshiftConsole')
             intervalPromise = null;
           }
 
+          if (unbindResizeHandler) {
+            unbindResizeHandler();
+            unbindResizeHandler = null;
+          }
+
           angular.forEach(donutByMetric, function(chart) {
             chart.destroy();
           });

dist/scripts/scripts.js

@@ -10004,18 +10004,22 @@ type:"Warning"
 })), b.log("events (subscribe)", d.events);
 })), d.highlightedEvents = {}, d.collapseSidebar = function() {
 d.collapsed = !0;
-}, c.$on("event.resource.highlight", function(a, b) {
+};
+var f = [];
+f.push(c.$on("event.resource.highlight", function(a, b) {
 var c = _.get(b, "kind"), e = _.get(b, "metadata.name");
 c && e && _.each(d.events, function(a) {
 a.involvedObject.kind === c && a.involvedObject.name === e && (d.highlightedEvents[c + "/" + e] = !0);
 });
-}), c.$on("event.resource.clear-highlight", function(a, b) {
+})), f.push(c.$on("event.resource.clear-highlight", function(a, b) {
 var c = _.get(b, "kind"), e = _.get(b, "metadata.name");
 c && e && _.each(d.events, function(a) {
 a.involvedObject.kind === c && a.involvedObject.name === e && (d.highlightedEvents[c + "/" + e] = !1);
 });
-}), d.$on("$destroy", function() {
-a.unwatchAll(e);
+})), d.$on("$destroy", function() {
+a.unwatchAll(e), _.each(f, function(a) {
+a();
+}), f = null;
 });
 } ]
 };
@@ -11993,9 +11997,9 @@ containerName:a.containerMetric ? m.options.selectedContainer.name :"pod"
 }) :null;
 }
 function u() {
-L = 0, _.each(m.metrics, function(a) {
+H || (L = 0, _.each(m.metrics, function(a) {
 p(a), o(a);
-});
+}));
 }
 function v(a) {
 if (!H) {
@@ -12161,10 +12165,12 @@ delete a.data;
 });
 }), delete m.metricsError, A();
 }, !0), B = b(A, i.getDefaultUpdateInterval(), !1);
-}), f.$on("metrics.charts.resize", function() {
+});
+var M = f.$on("metrics.charts.resize", function() {
 i.redraw(C), i.redraw(D);
-}), m.$on("$destroy", function() {
-B && (b.cancel(B), B = null), angular.forEach(C, function(a) {
+});
+m.$on("$destroy", function() {
+B && (b.cancel(B), B = null), M && (M(), M = null), angular.forEach(C, function(a) {
 a.destroy();
 }), C = null, angular.forEach(D, function(a) {
 a.destroy();
@@ -12374,10 +12380,12 @@ b.$watch("options", function() {
 A = {}, y = null, delete b.metricsError, s();
 }, !0), t = a(s, h.getDefaultUpdateInterval(), !1), b.updateInView = function(a) {
 B = !a, a && (!z || Date.now() > z + h.getDefaultUpdateInterval()) && s();
-}, e.$on("metrics.charts.resize", function() {
+};
+var G = e.$on("metrics.charts.resize", function() {
 h.redraw(u);
-}), b.$on("$destroy", function() {
-t && (a.cancel(t), t = null), angular.forEach(u, function(a) {
+});
+b.$on("$destroy", function() {
+t && (a.cancel(t), t = null), G && (G(), G = null), angular.forEach(u, function(a) {
 a.destroy();
 }), u = null, x = !0;
 });