issue allenhwkim#334, fixed JSON object string with number in it, which automatically converted to a number, to keep it as it is as a string

allenhwkim · allenhwkim · commit f743d52cba8f · 2015-10-08T04:25:26.000-04:00
diff --git a/config/protractor.conf.js b/config/protractor.conf.js
@@ -2,7 +2,7 @@
 exports.config = {
   seleniumServerJar: __dirname + 
     '/../node_modules/gulp-protractor' +
-    '/node_modules/protractor/selenium/selenium-server-standalone-2.45.0.jar',
+    '/node_modules/protractor/selenium/selenium-server-standalone-2.47.1.jar',
 
   browserName: 'chrome',
 
diff --git a/services/attr2_options.js b/services/attr2_options.js
@@ -78,7 +78,7 @@
           }
           else if (output === Object(output)) { // JSON is an object (not array or null)
             // check for nested hashes and convert to Google API options
-            output = getOptions(output, options);
+            output = getOptions(output, options, true);
           }
         } catch(err2) {
           // 3. Object Expression. i.e. LatLng(80,-49)
@@ -204,7 +204,7 @@
      * @param {scope} scope angularjs scope
      * @returns {Hash} options converted attributess
      */
-    var getOptions = function(attrs, scope) {
+    var getOptions = function(attrs, scope, doNotConverStringToNumber) {
       var options = {};
       for(var key in attrs) {
         if (attrs[key]) {
@@ -217,7 +217,11 @@
             if (typeof attrs[key] !== 'string') {
               options[key] = attrs[key];
             } else {
-              options[key] = toOptionValue(attrs[key], {scope:scope, key: key});
+              if (doNotConverStringToNumber && attrs[key].match(/^[0-9]+$/)) {
+                options[key] = attrs[key];
+              } else {
+                options[key] = toOptionValue(attrs[key], {scope:scope, key: key});
+              }
             }
           }
         } // if (attrs[key])
diff --git a/testapp/marker_with_label.html b/testapp/marker_with_label.html
@@ -0,0 +1,43 @@
+<!doctype html>
+<html>
+
+<head>
+  <script src="http://code.angularjs.org/1.4.6/angular.js"></script>
+  <script src="http://maps.google.com/maps/api/js"></script>
+  <!--
+  <script src="../build/scripts/ng-map.min.js"></script>
+  -->
+  <script src="../app.js"></script>
+  <script src="../directives/map_controller.js"></script>
+  <script src="../directives/map.js"></script>
+  <script src="../directives/marker.js"></script>
+  <script src="../directives/shape.js"></script>
+  <script src="../services/geo_coder.js"></script>
+  <script src="../services/navigator_geolocation.js"></script>
+  <script src="../services/attr2_options.js"></script>
+  <script>
+    var app = angular.module('myApp', ['ngMap']);
+
+    app.controller('MapCtrl', function($scope) {
+      $scope.results = [
+        {
+          id: "ChIJmzrzi9Y0K4gRgXUc3sTY7RU",   // This fails
+          lat: 57.479541,
+          lng: -4.225208
+        }
+      ];
+    }); 
+  </script>
+</head>
+
+<body ng-app="myApp">
+  <map ng-controller="MapCtrl" center="57.5,-4" zoom="8">
+    <marker
+      id="{{info.id}}"
+      ng-repeat="info in results"
+      position="{{info.lat}}, {{info.lng}}"
+      label='{ text: "3" }'></marker>
+  </map>
+</body>
+
+</html>
