Merge pull request #1963 from mehanika/bugfix-map-control

Fixed error in map control

Author: nmccready

spec/coffee/directives/api/control.spec.coffee

@@ -9,17 +9,6 @@ describe "directives.api.control", ->
     expect(@subject).toBeDefined()
     @log.error.calls.reset()
 
-  it "should log error if no template is supplied", ->
-    html = angular.element """
-      <ui-gmap-google-map center="map.center" zoom="map.zoom">
-        <ui-gmap-map-control></ui-gmap-map-control>
-      </ui-gmap-google-map>
-      """
-    element = @compile(html)(@scope)
-    @rootScope.$apply()
-    expect(@log.error).toHaveBeenCalledWith('mapControl: could not find a valid template property or elements for transclusion')
-    @log.error.calls.reset()
-
   it "should load template", ->
     html = angular.element """
       <ui-gmap-google-map center="map.center" zoom="map.zoom">

src/coffee/directives/api/control.coffee

@@ -9,13 +9,7 @@ angular.module("uiGmapgoogle-maps.directives.api")
         GoogleMapApi.then (maps) =>
           # Validate attributes
 
-          transcludedContent = transclude()
-
-          hasTranscludedContent = transclude().length > 0
-
-          if !hasTranscludedContent && angular.isUndefined scope.template
-            @$log.error 'mapControl: could not find a valid template property or elements for transclusion'
-            return
+          hasTranscludedContent = angular.isUndefined scope.template
 
           index = if angular.isDefined scope.index and not isNaN(parseInt scope.index) then parseInt scope.index else undefined
 
@@ -44,7 +38,7 @@ angular.module("uiGmapgoogle-maps.directives.api")
 
                 controlDiv.append transcludeEl
 
-                pushControl(map, controlDiv, index)
+                pushControl(map, controlDiv.children(), index)
 
             else
               $http.get(scope.template, { cache: $templateCache })