Check if container element exists before removing

vickramravichandran · Dec 11, 2016 · f77fddd · f77fddd
1 parent 9196857
commit f77fddd
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/angular-datepicker-light.js b/angular-datepicker-light.js
@@ -163,9 +163,13 @@
             });
 
             // cleanup on destroy
-            scope.$on('$destroy', function () {
-                ctrl.empty();
-                ctrl.container.remove();
+            var destroyFn = scope.$on('$destroy', function () {
+                if (ctrl.container) {
+                    ctrl.container.remove();
+                    ctrl.container = null; 
+                }
+
+                destroyFn()
             });
 
             function _documentKeyDown(e) {
@@ -182,6 +186,11 @@
                     return;
                 }
 
+                // no container. probably destroyed in scope $destroy 
+                if (!ctrl.container) {
+                    return;
+                }
+
                 // hide the active calendar if user clicks anywhere away from the dropdown list
                 var offset = ctrl.container[0].getBoundingClientRect();
                 var isMouseAwayFromActiveContainer = false;