fix(modal): Fixed mac-modal directive not cleaning up when being remo…

…ved from DOM

src/directives/modal.coffee

@@ -30,7 +30,8 @@ angular.module("Mac").directive("macModal", [
           element[0].getElementsByClassName "modal-content-wrapper"
         ).replaceWith clone
 
-      opts = util.extendAttributes "macModal", modalViews.defaults, attrs
+      opts  = util.extendAttributes "macModal", modalViews.defaults, attrs
+      regId = null
 
       if opts.overlayClose
         element.on "click", ($event) ->
@@ -39,13 +40,18 @@ angular.module("Mac").directive("macModal", [
 
       registerModal = (id) ->
         if id? and id
+          regId         = id
           opts.callback = $parse(attrs.macModalOpen)($scope)
           modal.register id, element, opts
 
       if attrs.id
         registerModal attrs.id
       else
         attrs.$observe "macModal", (id) -> registerModal id
+
+      # NOTE: Remove from modal service when mac-modal directive is removed
+      # from DOM
+      $scope.$on "$destroy", -> modal.unregister regId if regId
 ]).
 
 #

test/unit/modal.spec.coffee

@@ -106,6 +106,26 @@ describe "Mac modal", ->
 
       expect(modal.registered["test-modal"]).toBeDefined()
 
+    it "should unregister the modal when $scope is destroyed", ->
+      modalElement = $compile("<mac-modal id='test-modal'></mac-modal>") $rootScope
+      $rootScope.$digest()
+
+      $rootScope.$destroy()
+
+      expect(modal.registered["test-modal"]).not.toBeDefined()
+
+    it "should unregister the correct one", ->
+      scope        = $rootScope.$new()
+      scope1       = $rootScope.$new()
+      modalElement = $compile("<mac-modal id='test-modal'></mac-modal>") scope
+      modalElement = $compile("<mac-modal id='test-modal-1'></mac-modal>") scope1
+      $rootScope.$digest()
+
+      scope.$destroy()
+
+      expect(modal.registered["test-modal"]).not.toBeDefined()
+      expect(modal.registered["test-modal-1"]).toBeDefined()
+
     it "should close the modal was 'escape' key", ->
       opened       = false
       modalElement = $compile("<mac-modal id='test-modal' mac-modal-keyboard></mac-modal>") $rootScope