Passing the scope from every directive

harm-less · harm-less · commit f39bce2c3d92 · 2015-12-07T21:36:03.000+01:00
Every directive sends its scope to the "getOptions" method so it can be
evaluated if necessary
diff --git a/directives/bicycling-layer.js b/directives/bicycling-layer.js
@@ -21,7 +21,7 @@
     mapController = mapController[0]||mapController[1];
     var orgAttrs = parser.orgAttributes(element);
     var filtered = parser.filter(attrs);
-    var options = parser.getOptions(filtered);
+    var options = parser.getOptions(filtered, {scope: scope});
     var events = parser.getEvents(scope, filtered);
 
     console.log('bicycling-layer options', options, 'events', events);
diff --git a/directives/custom-control.js b/directives/custom-control.js
@@ -32,7 +32,7 @@
   var linkFunc = function(scope, element, attrs, mapController) {
     mapController = mapController[0]||mapController[1];
     var filtered = parser.filter(attrs);
-    var options = parser.getOptions(filtered);
+    var options = parser.getOptions(filtered, {scope: scope});
     var events = parser.getEvents(scope, filtered);
     console.log("custom-control options", options, "events", events);
 
diff --git a/directives/custom-marker.js b/directives/custom-marker.js
@@ -122,7 +122,7 @@
       var orgAttrs = parser.orgAttributes(element);
 
       var filtered = parser.filter(attrs);
-      var options = parser.getOptions(filtered, scope);
+      var options = parser.getOptions(filtered, {scope: scope});
       var events = parser.getEvents(scope, filtered);
 
       /**
diff --git a/directives/directions.js b/directives/directions.js
@@ -103,7 +103,7 @@
 
       var orgAttrs = parser.orgAttributes(element);
       var filtered = parser.filter(attrs);
-      var options = parser.getOptions(filtered);
+      var options = parser.getOptions(filtered, {scope: scope});
       var events = parser.getEvents(scope, filtered);
       var attrsToObserve = parser.getAttrsToObserve(orgAttrs);
 
diff --git a/directives/drawing-manager.js b/directives/drawing-manager.js
@@ -38,7 +38,7 @@
         mapController = mapController[0]||mapController[1];
 
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var controlOptions = parser.getControlOptions(filtered);
         var events = parser.getEvents(scope, filtered);
 
diff --git a/directives/dynamic-maps-engine-layer.js b/directives/dynamic-maps-engine-layer.js
@@ -38,7 +38,7 @@
         mapController = mapController[0]||mapController[1];
 
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered, events);
         console.log('dynamic-maps-engine-layer options', options, 'events', events);
 
diff --git a/directives/fusion-tables-layer.js b/directives/fusion-tables-layer.js
@@ -39,7 +39,7 @@
         mapController = mapController[0]||mapController[1];
 
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered, events);
         console.log('fusion-tables-layer options', options, 'events', events);
 
diff --git a/directives/heatmap-layer.js b/directives/heatmap-layer.js
@@ -30,7 +30,7 @@
         /**
          * set options
          */
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         options.data = $window[attrs.data] || scope[attrs.data];
         if (options.data instanceof Array) {
           options.data = new google.maps.MVCArray(options.data);
diff --git a/directives/info-window.js b/directives/info-window.js
@@ -113,7 +113,7 @@
 
       var orgAttrs = parser.orgAttributes(element);
       var filtered = parser.filter(attrs);
-      var options = parser.getOptions(filtered);
+      var options = parser.getOptions(filtered, {scope: scope});
       var events = parser.getEvents(scope, filtered);
       console.log('infoWindow', 'options', options, 'events', events);
 
diff --git a/directives/kml-layer.js b/directives/kml-layer.js
@@ -49,7 +49,7 @@
 
         var orgAttrs = parser.orgAttributes(element);
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered);
         console.log('kml-layer options', options, 'events', events);
 
diff --git a/directives/map-data.js b/directives/map-data.js
@@ -28,7 +28,7 @@
 
       link: function(scope, element, attrs) {
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered, events);
 
         console.log('map-data options', options);
diff --git a/directives/map-type.js b/directives/map-type.js
@@ -2,7 +2,7 @@
  * @ngdoc directive
  * @name map-type
  * @param Attr2MapOptions {service} 
- *   convert html attribute to Gogole map api options
+ *   convert html attribute to Google map api options
  * @description
  *   Requires:  map directive
  *   Restrict To:  Element
diff --git a/directives/maps-engine-layer.js b/directives/maps-engine-layer.js
@@ -36,7 +36,7 @@
         mapController = mapController[0]||mapController[1];
 
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered, events);
         console.log('maps-engine-layer options', options, 'events', events);
 
diff --git a/directives/marker.js b/directives/marker.js
@@ -83,7 +83,7 @@
 
     var orgAttrs = parser.orgAttributes(element);
     var filtered = parser.filter(attrs);
-    var markerOptions = parser.getOptions(filtered, scope);
+    var markerOptions = parser.getOptions(filtered, scope, {scope: scope});
     var markerEvents = parser.getEvents(scope, filtered);
     console.log('marker options', markerOptions, 'events', markerEvents);
 
diff --git a/directives/places-auto-complete.js b/directives/places-auto-complete.js
@@ -27,7 +27,7 @@
         return false;
       }
       var filtered = parser.filter(attrs);
-      var options = parser.getOptions(filtered);
+      var options = parser.getOptions(filtered, {scope: scope});
       var events = parser.getEvents(scope, filtered);
       console.log('autocomplete options', options, 'events', events);
       var autocomplete = new google.maps.places.Autocomplete(element[0], options);
diff --git a/directives/shape.js b/directives/shape.js
@@ -130,7 +130,7 @@
 
       var orgAttrs = parser.orgAttributes(element);
       var filtered = parser.filter(attrs);
-      var shapeOptions = parser.getOptions(filtered);
+      var shapeOptions = parser.getOptions(filtered, {scope: scope});
       var shapeEvents = parser.getEvents(scope, filtered);
 
       var address, shapeType;
diff --git a/directives/traffic-layer.js b/directives/traffic-layer.js
@@ -37,7 +37,7 @@
 
         var orgAttrs = parser.orgAttributes(element);
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered);
         console.log('traffic-layer options', options, 'events', events);
 
diff --git a/directives/transit-layer.js b/directives/transit-layer.js
@@ -37,7 +37,7 @@
 
         var orgAttrs = parser.orgAttributes(element);
         var filtered = parser.filter(attrs);
-        var options = parser.getOptions(filtered);
+        var options = parser.getOptions(filtered, {scope: scope});
         var events = parser.getEvents(scope, filtered);
         console.log('transit-layer options', options, 'events', events);
 
