fix(modal): Fix removing modal from DOM on .remove(), closes #755

ionic-team · Mar 10, 2014 · c4ca7a8 · c4ca7a8
1 parent 41afcdc
commit c4ca7a8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git 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
@@ -26,7 +26,6 @@
       <div class="modal" ng-controller="ModalCtrl">
         <header class="bar bar-header bar-assertive">
           <h1 class="title">New Contact</h1>
-          <button class="button button-clear button-primary" ng-click="close()">Cancel</button>
         </header>
         <ion-content has-header="true">
           <div class="padding">
@@ -43,7 +42,8 @@ <h1 class="title">New Contact</h1>
                 <span class="input-label">Email</span>
                 <input type="text" placeholder="">
               </label>
-              <button class="button button-block button-positive" ng-click="closeModal()">Create</button>
+              <button class="button button-block button-positive" ng-click="hideModal()">Hide Modal</button>
+              <button class="button button-block button-positive" ng-click="removeModal()">Remove Modal</button>
               <button class="button button-block button-positive" ng-click="openActionSheet()">ActionSheet</button>
             </div>
           </div>
@@ -72,9 +72,6 @@ <h1 class="title">New Contact</h1>
         $scope.openModal = function() {
           $scope.modal.show();
         };
-        $scope.closeModal = function() {
-          $scope.modal.hide();
-        };
         $ionicModal.fromTemplateUrl('modal.html', function(modal) {
           $scope.modal = modal;
         }, {
@@ -85,9 +82,12 @@ <h1 class="title">New Contact</h1>
       })
 
       .controller('ModalCtrl', function($scope, $ionicActionSheet) {
-        $scope.close = function() {
+        $scope.hideModal = function() {
           $scope.modal.hide();
-        }
+        };
+        $scope.removeModal = function() {
+          $scope.modal.remove();
+        };
 
         $scope.openActionSheet = function() {
           $ionicActionSheet.show({