fix(markers): Solved a critical bug not rendering any markers. Thanks…

… to @juanmanavarro for reporting here: #1017
tombatossals · Nov 6, 2015 · 15323bc · 15323bc
1 parent 24b9cdb
commit 15323bc
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/dist/angular-leaflet-directive.js b/dist/angular-leaflet-directive.js
@@ -492,7 +492,7 @@ angular.module('leaflet-directive').service('leafletData', ["$log", "$q", "leafl
       'geoJSON',
       'UTFGrid', //odd ball on naming convention keeping to not break
       'decorations',
-      'directiveControls', ];
+      'directiveControls',];
 
   //init
   _privateItems.forEach(function(itemName) {
@@ -5147,7 +5147,7 @@ angular.module('leaflet-directive').directive('tiles', ["$log", "leafletData", "
               });
             },
           };
-        }, ]);
+        },]);
 });
 
 angular.module('leaflet-directive')
@@ -5160,7 +5160,7 @@ angular.module('leaflet-directive')
 
   var EventsHelper = function(rootBroadcastName, lObjectType) {
     this.rootBroadcastName = rootBroadcastName;
-    $log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
+    $log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
 
     //used to path/key out certain properties based on the type , "markers", "geojson"
     this.lObjectType = lObjectType;
@@ -5317,10 +5317,10 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
-  leafletEventsHelpersFactory, leafletData) {
+.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
+  LeafletEventsHelpersFactory, leafletData) {
   var safeApply = leafletHelpers.safeApply;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var GeoJsonEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');
@@ -5365,9 +5365,9 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
+.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
   var Helpers = leafletHelpers;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var LabelEvents = function() {
           EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');
@@ -5509,12 +5509,12 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
+.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
   var safeApply = leafletHelpers.safeApply;
   var isDefined = leafletHelpers.isDefined;
   var Helpers = leafletHelpers;
   var lblHelp = leafletLabelEvents;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var MarkerEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

diff --git a/dist/angular-leaflet-directive.min.js b/dist/angular-leaflet-directive.min.js
diff --git a/dist/angular-leaflet-directive.no-header.js b/dist/angular-leaflet-directive.no-header.js
@@ -463,7 +463,7 @@ angular.module('leaflet-directive').service('leafletData', ["$log", "$q", "leafl
       'geoJSON',
       'UTFGrid', //odd ball on naming convention keeping to not break
       'decorations',
-      'directiveControls', ];
+      'directiveControls',];
 
   //init
   _privateItems.forEach(function(itemName) {
@@ -5118,7 +5118,7 @@ angular.module('leaflet-directive').directive('tiles', ["$log", "leafletData", "
               });
             },
           };
-        }, ]);
+        },]);
 });
 
 angular.module('leaflet-directive')
@@ -5131,7 +5131,7 @@ angular.module('leaflet-directive')
 
   var EventsHelper = function(rootBroadcastName, lObjectType) {
     this.rootBroadcastName = rootBroadcastName;
-    $log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
+    $log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
 
     //used to path/key out certain properties based on the type , "markers", "geojson"
     this.lObjectType = lObjectType;
@@ -5288,10 +5288,10 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
-  leafletEventsHelpersFactory, leafletData) {
+.factory('leafletGeoJsonEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletData", function($rootScope, $q, $log, leafletHelpers,
+  LeafletEventsHelpersFactory, leafletData) {
   var safeApply = leafletHelpers.safeApply;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var GeoJsonEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');
@@ -5336,9 +5336,9 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
+.factory('leafletLabelEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
   var Helpers = leafletHelpers;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var LabelEvents = function() {
           EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');
@@ -5480,12 +5480,12 @@ angular.module('leaflet-directive')
 }]);
 
 angular.module('leaflet-directive')
-.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "leafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
+.factory('leafletMarkerEvents', ["$rootScope", "$q", "$log", "leafletHelpers", "LeafletEventsHelpersFactory", "leafletLabelEvents", function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
   var safeApply = leafletHelpers.safeApply;
   var isDefined = leafletHelpers.isDefined;
   var Helpers = leafletHelpers;
   var lblHelp = leafletLabelEvents;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var MarkerEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

diff --git a/src/directives/watchOptions.js b/src/directives/watchOptions.js
@@ -34,5 +34,5 @@
               });
             },
           };
-        }, ]);
+        },]);
 });
diff --git a/src/services/events/leafletEventsHelpers.js b/src/services/events/leafletEventsHelpers.js
@@ -8,7 +8,7 @@ angular.module('leaflet-directive')
 
   var EventsHelper = function(rootBroadcastName, lObjectType) {
     this.rootBroadcastName = rootBroadcastName;
-    $log.debug('leafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
+    $log.debug('LeafletEventsHelpersFactory: lObjectType: ' + lObjectType + 'rootBroadcastName: ' + rootBroadcastName);
 
     //used to path/key out certain properties based on the type , "markers", "geojson"
     this.lObjectType = lObjectType;

diff --git a/src/services/events/leafletGeoJsonEvents.js b/src/services/events/leafletGeoJsonEvents.js
@@ -1,8 +1,8 @@
 angular.module('leaflet-directive')
 .factory('leafletGeoJsonEvents', function($rootScope, $q, $log, leafletHelpers,
-  leafletEventsHelpersFactory, leafletData) {
+  LeafletEventsHelpersFactory, leafletData) {
   var safeApply = leafletHelpers.safeApply;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var GeoJsonEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveGeoJson', 'geojson');

diff --git a/src/services/events/leafletLabelEvents.js b/src/services/events/leafletLabelEvents.js
@@ -1,7 +1,7 @@
 angular.module('leaflet-directive')
-.factory('leafletLabelEvents', function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory) {
+.factory('leafletLabelEvents', function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory) {
   var Helpers = leafletHelpers;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var LabelEvents = function() {
           EventsHelper.call(this, 'leafletDirectiveLabel', 'markers');

diff --git a/src/services/events/leafletMarkerEvents.js b/src/services/events/leafletMarkerEvents.js
@@ -1,10 +1,10 @@
 angular.module('leaflet-directive')
-.factory('leafletMarkerEvents', function($rootScope, $q, $log, leafletHelpers, leafletEventsHelpersFactory, leafletLabelEvents) {
+.factory('leafletMarkerEvents', function($rootScope, $q, $log, leafletHelpers, LeafletEventsHelpersFactory, leafletLabelEvents) {
   var safeApply = leafletHelpers.safeApply;
   var isDefined = leafletHelpers.isDefined;
   var Helpers = leafletHelpers;
   var lblHelp = leafletLabelEvents;
-  var EventsHelper = leafletEventsHelpersFactory;
+  var EventsHelper = LeafletEventsHelpersFactory;
 
   var MarkerEvents = function() {
       EventsHelper.call(this, 'leafletDirectiveMarker', 'markers');

diff --git a/src/services/leafletData.js b/src/services/leafletData.js
@@ -19,7 +19,7 @@ angular.module('leaflet-directive').service('leafletData', function($log, $q, le
       'geoJSON',
       'UTFGrid', //odd ball on naming convention keeping to not break
       'decorations',
-      'directiveControls', ];
+      'directiveControls',];
 
   //init
   _privateItems.forEach(function(itemName) {