From 2992e3592d2bb8a887a1a5619c194b9bf627eb0e Mon Sep 17 00:00:00 2001
From: Adrian Lee <adrianlee44@gmail.com>
Date: Mon, 3 Feb 2014 16:57:39 -0800
Subject: [PATCH] refactor(macModal): Add mac-modal-close to handle closing
 modal to remove a function used by  modal to close. Changed mac-modal
 directive to use the same parent scope.

---
 src/directives/modal.coffee | 38 ++++++++++++++++++-------------------
 src/services/modal.coffee   |  9 +++++++--
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/directives/modal.coffee b/src/directives/modal.coffee
index e02de32..ae247e0 100644
--- a/src/directives/modal.coffee
+++ b/src/directives/modal.coffee
@@ -22,35 +22,26 @@ angular.module("Mac").directive("macModal", [
     replace:    true
     transclude: true
 
-    # NOTE: Isolated scope to prevent adding `close` function to parent
-    # scope. Transcluded content is currently using parent scope.
-    scope:
-      open: "&macModalOpen"
-
     # NOTE: As of AngularJS 1.2.2, transclude function is on the link
     # function instead of compile
     link: ($scope, element, attrs, controller, transclude) ->
-      # NOTE: Similiar to ngTransclude directive but the scope is
-      # parent scope
-      transclude $scope.$parent, (clone) ->
-        wrapper = angular.element(
+      transclude $scope, (clone) ->
+        angular.element(
           element[0].getElementsByClassName "modal-content-wrapper"
-        )
-        wrapper.html ""
-        wrapper.append clone
+        ).replaceWith clone
 
       opts = util.extendAttributes "macModal", modalViews.defaults, attrs
 
+      if opts.overlayClose
+        element.on "click", ($event) ->
+          if angular.element($event.target).hasClass("modal-overlay")
+            $scope.$apply -> modal.hide()
+
       registerModal = (id) ->
         if id? and id
-          opts.callback = $scope.open
+          opts.callback = $parse(attrs.macModalOpen)($scope)
           modal.register id, element, opts
 
-      $scope.close = ($event, force = false) ->
-        if force or (opts.overlayClose and
-            angular.element($event.target).hasClass("modal-overlay"))
-          modal.hide()
-
       if attrs.id
         registerModal attrs.id
       else
@@ -65,7 +56,7 @@ angular.module("Mac").directive("macModal", [
 # @param {String} mac-modal    Modal ID to trigger
 # @param {Expr} mac-modal-data Extra data to pass along
 #
-directive "macModal", [
+directive("macModal", [
   "$parse"
   "modal"
   ($parse, modal) ->
@@ -84,4 +75,13 @@ directive "macModal", [
             scope: modalScope
           modalScope.$apply()
       return
+]).
+
+directive "macModalClose", [
+  "modal"
+  (modal) ->
+    restrict: "A"
+    link:     ($scope, element, attrs) ->
+      element.bind "click", ->
+        $scope.$apply -> modal.hide()
 ]
diff --git a/src/services/modal.coffee b/src/services/modal.coffee
index c8cbe55..60ccdce 100644
--- a/src/services/modal.coffee
+++ b/src/services/modal.coffee
@@ -53,9 +53,9 @@ angular.module("Mac").service("modal", [
     opened: null
 
     modalTemplate: """
-      <div ng-click="close($event)" class="modal-overlay hide">
+      <div class="modal-overlay hide">
         <div class="modal">
-          <a ng-click="close($event, true)" class="close-modal"></a>
+          <a mac-modal-close class="close-modal"></a>
           <div class="modal-content-wrapper"></div>
         </div>
       </div>
@@ -114,6 +114,11 @@ angular.module("Mac").service("modal", [
             )
             wrapper.html template
 
+            if options.overlayClose
+              element.bind "click", ($event) ->
+                if angular.element($event.target).hasClass("modal-overlay")
+                  viewScope.$apply => @hide()
+
             $animate.enter element, angular.element(document.body)
             $compile(element) viewScope