Merge pull request #148 from nlaplante/ng1.2.2

NG - 1.2.2 support

Author: nlaplante

Gruntfile.js

@@ -151,7 +151,8 @@ module.exports = function (grunt) {
                 src: ['dist/angular-google-maps.js'],
                 options: {
                     keepRunner: true,
-                    vendor: ['http://maps.googleapis.com/maps/api/js?sensor=false&language=en', 'lib/*.js', 'dist/angular-google-maps.js'],
+                    vendor: ['http://maps.googleapis.com/maps/api/js?sensor=false&language=en','lib/jquery.js',
+                        'lib/angular.js','lib/angular-mock.js','lib/lodash.js','dist/angular-google-maps.js'],
                     specs: ['spec/*.spec.js', 'spec/**/*.spec.js', 'spec/**/**/*-spec.js', 'spec/**/**/**/*.spec.js',
                         'tmp/spec/js/*/spec.js', 'tmp/spec/**/*.spec.js', 'tmp/spec/**/**/*-spec.js', 'tmp/spec/**/**/**/*.spec.js'
                     ],

component.json

@@ -2,6 +2,7 @@
   "name": "angular-google-maps",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "~1.0.7"
+    "angular": "~1.2.2",
+    "angular-mocks": "~1.2.2"
   }
 }

dist/angular-google-maps.js

@@ -1701,7 +1701,6 @@
         this.$log = directives.api.utils.Logger;
         this.$timeout = $timeout;
         this.restrict = 'ECMA';
-        this.replace = true;
         this.require = '^googleMap';
         this.priority = -1;
         this.transclude = true;
@@ -1892,8 +1891,10 @@
 
       Marker.prototype.controller = [
         '$scope', '$element', function($scope, $element) {
-          return this.getMarker = function() {
-            return $element.data('instance');
+          return {
+            getMarker: function() {
+              return $element.data('instance');
+            }
           };
         }
       ];
@@ -1949,8 +1950,10 @@ not 1:1 in this setting.
 
       Markers.prototype.controller = [
         '$scope', '$element', function($scope, $element) {
-          return this.getMarkersScope = function() {
-            return $scope;
+          return {
+            getMarkersScope: function() {
+              return $scope;
+            }
           };
         }
       ];

dist/angular-google-maps.min.js

@@ -285,9 +285,9 @@ <h1>angular-google-maps example</h1>
 </div>
 <script src="//ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script>
 <script src="http://maps.googleapis.com/maps/api/js?libraries=weather&sensor=false&language=en&v=3.13"></script>
-<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.0.7/angular.js"></script>
+<script src="http://ajax.googleapis.com/ajax/libs/angularjs/1.2.2/angular.js"></script>
 <script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.2/js/bootstrap.min.js"></script>
-<script src="http://underscorejs.org/underscore-min.js"></script>
+<script src="//cdn.jsdelivr.net/lodash/2.4.0/lodash.backbone.js" type="text/javascript"></script>
 <script src="angular-google-maps.js"></script>
 <script src="example-controller.js"></script>
 <script src="templates/infoController.js"></script>