Issue allenhwkim#291, removed observe restriction on ng-repeat

Allen Kim · Allen Kim · commit 0215010001a6 · 2015-09-27T20:11:27.000-04:00
diff --git a/services/attr2_options.js b/services/attr2_options.js
@@ -26,13 +26,13 @@
     } catch(e) { // if not parsable, change little
       return str
         // wrap keys without quote with valid double quote
-        .replace(/([\$\w]+)\s*:/g, function(_, $1){return '"'+$1+'":'})
+        .replace(/([\$\w]+)\s*:/g, function(_, $1){return '"'+$1+'":';})
         // replacing single quote wrapped ones to double quote 
-        .replace(/'([^']+)'/g, function(_, $1){return '"'+$1+'"'})
+        .replace(/'([^']+)'/g, function(_, $1){return '"'+$1+'"';});
     }
   }
 
-  var Attr2Options = function($parse, $timeout, NavigatorGeolocation, GeoCoder) { 
+  var Attr2Options = function($parse, $timeout, $log, NavigatorGeolocation, GeoCoder) { 
 
     /**
      * Returns the attributes of an element as hash
@@ -128,14 +128,13 @@
     var getAttrsToObserve = function(attrs) {
       var attrsToObserve = [];
       if (attrs["ng-repeat"] || attrs.ngRepeat) {  // if element is created by ng-repeat, don't observe any
-        void(0);
-      } else {
-        for (var attrName in attrs) {
-          var attrValue = attrs[attrName];
-          if (attrValue && attrValue.match(/\{\{.*\}\}/)) { // if attr value is {{..}}
-            console.log('setting attribute to observe', attrName, camelCase(attrName), attrValue);
-            attrsToObserve.push(camelCase(attrName));
-          }
+        $log.warn("It is NOT ideal to have many observers or watcher with ng-repeat. Please use it with your own risk");
+      }
+      for (var attrName in attrs) {
+        var attrValue = attrs[attrName];
+        if (attrValue && attrValue.match(/\{\{.*\}\}/)) { // if attr value is {{..}}
+          console.log('setting attribute to observe', attrName, camelCase(attrName), attrValue);
+          attrsToObserve.push(camelCase(attrName));
         }
       }
       return attrsToObserve;
@@ -284,8 +283,8 @@
                       return str;
                     }
                   });
-                } 
-                
+                }
+
                 if (key === "style") {
                   var str = attr.charAt(0).toUpperCase() + attr.slice(1);
                   var objName = str.replace(/Options$/,'')+"Style";
@@ -318,8 +317,8 @@
       orgAttributes: orgAttributes
     }; // return
 
-  }; 
-  Attr2Options.$inject= ['$parse', '$timeout', 'NavigatorGeolocation', 'GeoCoder'];
+  };
+  Attr2Options.$inject= ['$parse', '$timeout', '$log', 'NavigatorGeolocation', 'GeoCoder'];
 
   angular.module('ngMap').service('Attr2Options', Attr2Options);
 })();
diff --git a/testapp/marker_with_ng_repeat.html b/testapp/marker_with_ng_repeat.html
@@ -27,12 +27,14 @@
 
 <body>
     <div ng-controller="MyCtrl">
+      <input type="checkbox" ng-model="draggable" /> Draggable
       <map zoom="11" center="[40.74, -74.18]">
         <marker ng-repeat="p in positions" position="{{p}}" title="pos: {{p}}"></marker>
       </map>
       <map zoom="11" center="[40.74, -74.18]">
-        <marker ng-repeat="p in positions2" position="{{p.pos}}" title="pos: {{p.pos}}"></marker>
+        <marker ng-repeat="p in positions2" draggable="{{draggable}}" position="{{p.pos}}" title="pos: {{p.pos}}"></marker>
       </map>
+      draggable: {{draggable}}
     </div>
 </body>
 </html>
