Merge pull request #105 from trafficland/r1-dev

fixed broken minified

Author: nmccready

Gruntfile.js

@@ -72,20 +72,7 @@ module.exports = function(grunt) {
         dest: 'tmp/output.js'
       },
       example: {
-        src: ['src/js/module.js',
-              'tmp/output_coffee.js',
-              'src/js/utils/markerclusterer-r438.js', 
-              'src/js/utils/LatLngArraySync.js', 
-              'src/js/utils/MapEvents.js', 
-              'src/js/controllers/polyline-display.js',
-              'src/js/directives/map.js',
-              'src/js/directives/marker.js',
-              'src/js/directives/markers.js',
-              'src/js/directives/polygon.js',
-              'src/js/directives/polyline.js',
-              'src/js/directives/window.js',
-              'src/js/directives/windows.js',
-              'src/js/directives/trafficlayer.js'],
+        src: ['dist/angular-google-maps.min.js'],
         dest: 'example/<%= pkg.name %>.js'
       }
     },

dist/angular-google-maps.js

@@ -1333,8 +1333,12 @@
         };
       }
 
-      IMarker.prototype.controller = function($scope, $element) {
-        throw new Exception("Not Implemented!!");
+      IMarker.prototype.controller = {
+        controller: [
+          '$scope', '$element', function($scope, $element) {
+            throw new Exception("Not Implemented!!");
+          }
+        ]
       };
 
       IMarker.prototype.link = function(scope, element, attrs, ctrl) {
@@ -1422,11 +1426,13 @@
         this.$log.info(this);
       }
 
-      Marker.prototype.controller = function($scope, $element) {
-        return this.getMarker = function() {
-          return $element.data('instance');
-        };
-      };
+      Marker.prototype.controller = [
+        '$scope', '$element', function($scope, $element) {
+          return this.getMarker = function() {
+            return $element.data('instance');
+          };
+        }
+      ];
 
       Marker.prototype.link = function(scope, element, attrs, ctrl) {
         return new directives.api.models.parent.MarkerParentModel(scope, element, attrs, ctrl, this.$timeout);
@@ -1472,11 +1478,13 @@ not 1:1 in this setting.
         this.$log.info(this);
       }
 
-      Markers.prototype.controller = function($scope, $element) {
-        return this.getMarkersScope = function() {
-          return $scope;
-        };
-      };
+      Markers.prototype.controller = [
+        '$scope', '$element', function($scope, $element) {
+          return this.getMarkersScope = function() {
+            return $scope;
+          };
+        }
+      ];
 
       Markers.prototype.link = function(scope, element, attrs, ctrl) {
         return new directives.api.models.parent.MarkersParentModel(scope, element, attrs, ctrl, this.$timeout);

dist/angular-google-maps.min.js

@@ -75,7 +75,7 @@ <h1>angular-google-maps example</h1>
 				dragging="map.dragging"
 				bounds="map.bounds"
 				events="map.events"
-        options="map.options">
+        		options="map.options">
 				<trafficlayer show="map.showTraffic" />
 
 				<markers models="map.randomMarkers" coords="'self'" icon="'icon'" click="'onClicked'" doCluster="true">

example/example.html

@@ -23,7 +23,8 @@
 				click: '&click',
 				options: '=options'
 			}
-		controller: ($scope, $element) ->
+		controller: controller: ['$scope','$element', ($scope, $element) ->
 			throw new Exception("Not Implemented!!")
+		]
 		link: (scope, element, attrs, ctrl) =>
 			throw new Exception("Not implemented!!")

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

@@ -10,9 +10,9 @@
 			@template = '<span class="angular-google-map-marker" ng-transclude></span>'
 			@$log.info(@)
 
-		controller:($scope, $element) ->
+		controller: ['$scope','$element', ($scope, $element) ->
 			@getMarker = ->
 				$element.data('instance')
-
+		]
 		link: (scope, element, attrs, ctrl) =>
 			new directives.api.models.parent.MarkerParentModel(scope, element, attrs, ctrl, @$timeout)

src/coffee/directives/api/marker.coffee

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