Update toast error notification cleanup for components that are in di…

…alogs
openshift · Jun 13, 2017 · f473707 · f473707
1 parent 8844c42
commit f473707
Show file tree

Hide file tree

Showing 6 changed files with 447 additions and 247 deletions.
diff --git a/app/scripts/directives/fromFile.js b/app/scripts/directives/fromFile.js
@@ -513,6 +513,7 @@ angular.module("openshiftConsole")
         // button is outside the component since it is in the wizard footer. Listen
         // for an event for when the button is clicked.
         $scope.$on('importFileFromYAMLOrJSON', $scope.create);
+        $scope.$on('$destroy', hideErrorNotifications);
       }
     };
   });
diff --git a/app/scripts/directives/processTemplate.js b/app/scripts/directives/processTemplate.js
@@ -268,7 +268,7 @@
     // button is outside the component since it is in the wizard footer. Listen
     // for an event for when the button is clicked.
     $scope.$on('instantiateTemplate', ctrl.createFromTemplate);
-    $scope.$on('hideTemplateNotificationErrors', hideNotificationErrors);
+    $scope.$on('$destroy', hideNotificationErrors);
 
     var shouldAddAppLabel = function() {
       // If the template defines its own app label, we don't need to add one at all

diff --git a/app/scripts/directives/processTemplateDialog.js b/app/scripts/directives/processTemplateDialog.js
@@ -79,8 +79,6 @@
     };
 
     ctrl.close = function() {
-      $scope.$broadcast('hideTemplateNotificationErrors');
-
       var cb = ctrl.onDialogClosed();
       if (_.isFunction(cb)) {
         cb();