diff --git a/js/ext/angular/src/service/ionicModal.js b/js/ext/angular/src/service/ionicModal.js index ee69257c25e..4e9fa127046 100644 --- a/js/ext/angular/src/service/ionicModal.js +++ b/js/ext/angular/src/service/ionicModal.js @@ -26,7 +26,7 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv $timeout(function(){ element.addClass('ng-enter-active'); - self.scope.$parent.$broadcast('modal.shown'); + self.scope.$parent && self.scope.$parent.$broadcast('modal.shown'); }, 20); self._deregisterBackButton = $ionicPlatform.registerBackButtonAction(function(){ @@ -65,7 +65,8 @@ angular.module('ionic.service.modal', ['ionic.service.templateLoad', 'ionic.serv $timeout(function(){ self.scope.$destroy(); - }, 500); + self.el && self.el.parentElement && self.el.parentElement.removeChild(self.el); + }, 1000); }, isShown: function() { diff --git a/js/ext/angular/test/modal.html b/js/ext/angular/test/modal.html index c8cd5fb659a..058a6a4b40f 100644 --- a/js/ext/angular/test/modal.html +++ b/js/ext/angular/test/modal.html @@ -26,7 +26,6 @@