angular 1.2.2 is working

Author: nmccready

Gruntfile.js

@@ -77,8 +77,8 @@ module.exports = function (grunt) {
                 dest: 'tmp/output.js'
             },
             example: {
-                src: ['dist/angular-google-maps.js'],
-//                src: ['dist/angular-google-maps.min.js'], //use min for release, otherwise other for testing
+//                src: ['dist/angular-google-maps.js'],
+                src: ['dist/angular-google-maps.min.js'], //use min for release, otherwise other for testing
                 dest: 'example/<%= pkg.name %>.js'
             }
         },

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,16 +1891,15 @@
 
       Marker.prototype.controller = [
         '$scope', '$element', function($scope, $element) {
-          return this.getMarker = function() {
-            return $element.data('instance');
+          return {
+            getMarker: function() {
+              return $element.data('instance');
+            }
           };
         }
       ];
 
       Marker.prototype.link = function(scope, element, attrs, ctrl) {
-        scope.$on('$includeContentLoaded', function(evt) {
-          return ctrl.init(element.next());
-        });
         return new directives.api.models.parent.MarkerParentModel(scope, element, attrs, ctrl, this.$timeout);
       };
 
@@ -1952,16 +1950,15 @@ 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;
+            }
           };
         }
       ];
 
       Markers.prototype.link = function(scope, element, attrs, ctrl) {
-        scope.$on('$includeContentLoaded', function(evt) {
-          return ctrl.init(element.next());
-        });
         return new directives.api.models.parent.MarkersParentModel(scope, element, attrs, ctrl, this.$timeout);
       };
 
@@ -4501,12 +4498,6 @@ angular.module('google-maps')
              * @param attrs
              */
             link: function (scope, element, attrs) {
-                //new as of angular 1.2.1+
-                //https://github.com/angular/angular.js/issues/4935
-                //http://plnkr.co/edit/oeWTQbzrBGSBzi1iu2WQ?p=preview
-                scope.$on('$includeContentLoaded', function(evt) {
-                    ctrl.init(element.next());
-                });
 
                 // Center property must be specified and provide lat &
                 // lng properties

dist/angular-google-maps.min.js

@@ -13,7 +13,6 @@
 			@$log = directives.api.utils.Logger
 			@$timeout = $timeout
 			@restrict = 'ECMA'
-			@replace = true
 			@require = '^googleMap'
 			@priority = -1
 			@transclude = true

src/coffee/directives/api/i-marker.coffee

@@ -11,11 +11,8 @@
             @$log.info(@)
 
         controller: ['$scope', '$element', ($scope, $element) ->
-            @getMarker = ->
+            getMarker: ->
                 $element.data('instance')
         ]
         link: (scope, element, attrs, ctrl) =>
-            scope.$on('$includeContentLoaded', (evt) ->
-                ctrl.init(element.next())
-            )
             new directives.api.models.parent.MarkerParentModel(scope, element, attrs, ctrl, @$timeout)

src/coffee/directives/api/marker.coffee

@@ -28,12 +28,9 @@ not 1:1 in this setting.
             @$log.info(@)
 
         controller: ['$scope', '$element', ($scope, $element) ->
-            @getMarkersScope = ->
+            getMarkersScope: ->
                 $scope
         ]
 
         link: (scope, element, attrs, ctrl) =>
-            scope.$on('$includeContentLoaded', (evt) ->
-                ctrl.init(element.next())
-            )
             new directives.api.models.parent.MarkersParentModel(scope, element, attrs, ctrl, @$timeout)

src/coffee/directives/api/markers.coffee

@@ -114,12 +114,6 @@ angular.module('google-maps')
              * @param attrs
              */
             link: function (scope, element, attrs) {
-                //new as of angular 1.2.1+
-                //https://github.com/angular/angular.js/issues/4935
-                //http://plnkr.co/edit/oeWTQbzrBGSBzi1iu2WQ?p=preview
-                scope.$on('$includeContentLoaded', function(evt) {
-                    ctrl.init(element.next());
-                });
 
                 // Center property must be specified and provide lat &
                 // lng properties