fix(macModal): Fixed mac-modal firing $digest cycle

Fixes #138
angular-macgyver · Nov 25, 2013 · bfa9b37 · bfa9b37
1 parent b1ce786
commit bfa9b37
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/directives/modal.coffee b/src/directives/modal.coffee
@@ -72,5 +72,6 @@ directive "macModal", [
           modal.show attrs.macModal,
             data:  $parse(dataVar) $scope
             scope: modalScope
+          modalScope.$apply()
       return
 ]
diff --git a/src/services/modal.coffee b/src/services/modal.coffee
@@ -88,7 +88,7 @@ angular.module("Mac").service("modal", [
 
         # if modal is created thru module method "modal"
         if options.moduleMethod?
-          renderModal = (template, invokeApply = true) =>
+          renderModal = (template) =>
             viewScope =
               if options.scope then options.scope.$new() else $rootScope.$new(true)
             viewScope.modal        = this
@@ -110,7 +110,6 @@ angular.module("Mac").service("modal", [
             $compile(element) viewScope
 
             showModal element
-            $rootScope.$apply() if invokeApply
 
           if (path = options.templateUrl)
             template = $templateCache.get path
@@ -119,7 +118,7 @@ angular.module("Mac").service("modal", [
             else
               $http.get(path).then (resp) ->
                 $templateCache.put path, resp.data
-                renderModal resp.data, false
+                renderModal resp.data
               , ->
                 throw Error("Failed to load template: #{path}")
           else if (template = options.template)