fix: better handle scope apply on event callback

Author: toutpt

src/leaflet.service.js

@@ -5,7 +5,7 @@ function LeafletService($compile) {
     this.on = function(event, callback, map, scope) {
         map.on(event, function (e) {
             callback(e);
-            if (!scope.$$phase) {
+            if (scope.$root.$$phase != '$apply' && scope.$root.$$phase != '$digest') {
                 scope.$apply();
             }
         });

src/leaflet.service.spec.js

@@ -33,7 +33,7 @@ ngDescribe({
             };
             var scope = {'$on': function (event, callback) {
                 eventRegistry[event] = callback;
-            }, '$apply': function () {
+            }, '$root': {}, '$apply': function () {
                 isApplyed = true;
             }};
 
@@ -56,10 +56,18 @@ ngDescribe({
 
             iscallbackCalled = false;
             isApplyed = false;
-            scope.$$phase = true; //mark that already in digest
+            scope.$root = {'$$phase': '$apply'}; //mark that already in digest
             eventRegistry.click(data);
             expect(iscallbackCalled).toBe(true);
             expect(isApplyed).toBe(false);
+
+            iscallbackCalled = false;
+            isApplyed = false;
+            scope.$root = {'$$phase': '$digest'}; //mark that already in digest
+            eventRegistry.click(data);
+            expect(iscallbackCalled).toBe(true);
+            expect(isApplyed).toBe(false);
+
         });
     }