Fix compile call; must specify ng-contoller in window content

angular-ui · Feb 9, 2014 · b7833e7 · nmccready · Feb 9, 2014 · nlaplante
1 parent 6f7e8cf
commit b7833e7
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 8 deletions.
diff --git a/dist/angular-google-maps.js b/dist/angular-google-maps.js
@@ -326,7 +326,7 @@ Nicholas McCready - https://twitter.com/nmccready
       createWindowOptions: function(gMarker, scope, content, defaults, $compile) {
         if ((content != null) && (defaults != null)) {
           return angular.extend({}, defaults, {
-            content: defaults.content != null ? $compile(defaults.content)(scope.$new()) : $compile(content)(scope.$new()),
+            content: defaults.content != null ? defaults.content : $compile(content)(scope)[0],
             position: defaults.position != null ? defaults.position : angular.isObject(gMarker) ? gMarker.getPosition() : new google.maps.LatLng(scope.coords.latitude, scope.coords.longitude)
           });
         }

diff --git a/dist/angular-google-maps.min.js b/dist/angular-google-maps.min.js
diff --git a/example/example-controller.js b/example/example-controller.js
@@ -57,6 +57,10 @@ function ExampleController($scope, $timeout, $log, $http, Logger) {
         example2: {
             doRebuildAll: false
         },
+        clickWindow: function () {
+        	$log.info('CLICK CLICK');
+        	Logger.info('CLICK CLICK');
+        },
         map: {
             version: "uknown",
             heatLayerCallback: function (layer) {

diff --git a/example/example.html b/example/example.html
@@ -51,8 +51,12 @@ <h2>angular-google-maps example {{version}}</h2>
         <!--WINDOWS without markers-->
         <!--NOTICE THEY MUST BE PRIOR TO ANY MARKERS OR THEY WILL ATTACH THEMSELVES walking up the dom tree-->
         <window show="map.infoWindow.show" coords="map.infoWindow.coords" isIconVisibleOnClick="false" options="map.infoWindow.options">
-            I should not be attached to a
-            marker.
+			<div ng-controller='InfoController'>
+			    I should not be attached to a
+            	marker.
+
+	            <a class="btn" ng-click="clickedButtonInWindow()">CLICK ME</a>
+            </div>
         </window>
 
         <window show="map.templatedInfoWindow.show" coords="map.templatedInfoWindow.coords"

diff --git a/example/templates/infoController.js b/example/templates/infoController.js
@@ -1,4 +1,7 @@
-function InfoController($scope) {
+function InfoController($scope, $log) {
 	$scope.templateValue = 'hello from the template itself';
+	$scope.clickedButtonInWindow = function () {
+		$log.info('clicked a window in the template!');
+	};
 };
 
diff --git a/src/coffee/directives/api/utils/gmap-util.coffee b/src/coffee/directives/api/utils/gmap-util.coffee
@@ -24,9 +24,9 @@ angular.module("google-maps.api.utils")
         if content? and defaults?
             angular.extend {}, defaults,
                 content: if defaults.content?
-                then $compile(defaults.content)(scope.$new()) else $compile(content)(scope.$new()),
+                then defaults.content else $compile(content)(scope)[0],
                 position: if defaults.position?
                 then defaults.position else if angular.isObject(gMarker)
                 then gMarker.getPosition() else new google.maps.LatLng(scope.coords.latitude, scope.coords.longitude)
 
-    defaultDelay: 50
+    defaultDelay: 50
diff --git a/src/coffee/directives/api/window.coffee b/src/coffee/directives/api/window.coffee
@@ -40,4 +40,4 @@ angular.module("google-maps.api")
                     @onChildCreation(window) if @onChildCreation? and window?
                 , GmapUtil.defaultDelay + 25)
         return Window
-]
+]