Merge branch 'master' of https://github.com/allenhwkim/angularjs-google-maps

allenhwkim · allenhwkim · commit 62f8617f06d7 · 2015-08-27T10:22:59.000-04:00
diff --git a/README.md b/README.md
@@ -5,9 +5,9 @@ GoogleMap AngularJS Directive
 
 [Demo](http://ngmap.github.io)  
 [Documentation](https://rawgithub.amrom.workers.dev/allenhwkim/angularjs-google-maps/master/build/docs/index.html)  
-**[Road Trip By StreetView](https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/street-view_road_trip.html)**   
+[Road Trip By StreetView](https://rawgit.com/allenhwkim/angularjs-google-maps/master/testapp/street-view_road_trip.html)  
 
-There is already [one](https://github.com/nlaplante/angular-google-maps) for this. However, I found myself doing totally different approach for this purpose than the existing one, such as;
+here is already [one](https://github.com/nlaplante/angular-google-maps) for this. However, I found myself doing totally different approach for this purpose than the existing one, such as;
 
 1. **Everything in tag and attributes.**   
    Thus, basic users don't even have to know what Javascript is. 
diff --git a/directives/custom-marker.js b/directives/custom-marker.js
@@ -40,7 +40,7 @@
 
     this.el = document.createElement('div');
     this.el.style.display = 'inline-block';
-    Nthis.visible = true; for (var key in options) {
+    this.visible = true; for (var key in options) {
      this[key] = options[key];
     }
   };
diff --git a/testapp/custom-marker.html b/testapp/custom-marker.html
@@ -2,7 +2,7 @@
 <html ng-app="myapp">
   <head>
     <script src="https://maps.googleapis.com/maps/api/js?v=3.exp"></script>
-    <script src="http://code.angularjs.org/1.3.16/angular.js"></script>
+    <script src="https://code.angularjs.org/1.3.16/angular.js"></script>
     <!--
     <script src="../build/scripts/ng-map.min.js"></script>
     -->

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`
`41`	`41`	`this.el = document.createElement('div');`
`42`	`42`	`this.el.style.display = 'inline-block';`
`43`		`- Nthis.visible = true; for (var key in options) {`
	`43`	`+ this.visible = true; for (var key in options) {`
`44`	`44`	`this[key] = options[key];`
`45`	`45`	`}`
`46`	`46`	`};`