From d7a8d433de6e15d81a17cae89089901802a61414 Mon Sep 17 00:00:00 2001
From: Mads Rasmussen <mads@umbraco.com>
Date: Mon, 28 May 2018 21:19:23 +0200
Subject: [PATCH] add null check + remove weird ngShow support

---
 .../overlays/umboverlay.directive.js          | 28 +++++--------------
 1 file changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
index 56a68f9596..d339b4c0f3 100644
--- a/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
+++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/overlays/umboverlay.directive.js
@@ -674,35 +674,21 @@ Opens an overlay to show a custom YSOD. </br>
 
             unregisterOverlay();
 
-            if (scope.model.close) {
-               scope.model = modelCopy;
+            if (scope.model && scope.model.close) {
+                scope.model = modelCopy;
                scope.model.close(scope.model);
             } else {
                 scope.model.show = false;
-               scope.model = null;
+                scope.model = null;
             }
 
          };
 
-         // angular does not support ng-show on custom directives
-         // width isolated scopes. So we have to make our own.
-         if (attr.hasOwnProperty("ngShow")) {
-            scope.$watch("ngShow", function(value) {
-               if (value) {
-                  el.show();
-                  activate();
-               } else {
-                  unregisterOverlay();
-                  el.hide();
-               }
-            });
-         } else {
-            activate();
-         }
-
-         scope.$on('$destroy', function(){
+        scope.$on('$destroy', function(){
             unregisterOverlay();
-         });
+        });
+
+        activate();
 
       }