Merge pull request angular-ui#860 from aesnyder/aes/fix-close-button

Aes/fix close button

Author: Aaron Ellis Snyder

dist/angular-google-maps.js

@@ -1961,6 +1961,26 @@ Nicholas McCready - https://twitter.com/nmccready
 
 }).call(this);
 
+(function() {
+  angular.module("google-maps.directives.api.utils".ns()).factory("ChromeFixes".ns(), [
+    function() {
+      return {
+        maybeRepaint: function(el) {
+          var od;
+          if (el) {
+            od = el.style.display;
+            el.style.display = 'none';
+            return _.defer(function() {
+              return el.style.display = od;
+            });
+          }
+        }
+      };
+    }
+  ]);
+
+}).call(this);
+
 (function() {
   var __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
     __hasProp = {}.hasOwnProperty,
@@ -2933,7 +2953,7 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
     __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
   angular.module("google-maps.directives.api.models.child".ns()).factory("WindowChildModel".ns(), [
-    "BaseObject".ns(), "GmapUtil".ns(), "Logger".ns(), "$compile", "$http", "$templateCache", function(BaseObject, GmapUtil, $log, $compile, $http, $templateCache) {
+    "BaseObject".ns(), "GmapUtil".ns(), "Logger".ns(), "$compile", "$http", "$templateCache", 'uiGmapChromeFixes', function(BaseObject, GmapUtil, $log, $compile, $http, $templateCache, ChromeFixes) {
       var WindowChildModel;
       WindowChildModel = (function(_super) {
         __extends(WindowChildModel, _super);
@@ -3145,10 +3165,23 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
         };
 
         WindowChildModel.prototype.showWindow = function() {
-          var compiled, templateScope;
+          var compiled, show, templateScope;
           if (this.gWin != null) {
+            show = (function(_this) {
+              return function() {
+                return _.defer(function() {
+                  if (!_this.gWin.isOpen()) {
+                    _this.gWin.open(_this.mapCtrl, _this.getGmarker() ? _this.getGmarker() : void 0);
+                    _this.model.show = _this.gWin.isOpen();
+                    return _.defer(function() {
+                      return ChromeFixes.maybeRepaint(_this.gWin.content);
+                    });
+                  }
+                });
+              };
+            })(this);
             if (this.scope.templateUrl) {
-              $http.get(this.scope.templateUrl, {
+              return $http.get(this.scope.templateUrl, {
                 cache: $templateCache
               }).then((function(_this) {
                 return function(content) {
@@ -3158,7 +3191,8 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
                     templateScope.parameter = _this.scope.templateParameter;
                   }
                   compiled = $compile(content.data)(templateScope);
-                  return _this.gWin.setContent(compiled[0]);
+                  _this.gWin.setContent(compiled[0]);
+                  return show();
                 };
               })(this));
             } else if (this.scope.template) {
@@ -3168,10 +3202,9 @@ Original idea from: http://stackoverflow.com/questions/22758950/google-map-drawi
               }
               compiled = $compile(this.scope.template)(templateScope);
               this.gWin.setContent(compiled[0]);
-            }
-            if (!this.gWin.isOpen()) {
-              this.gWin.open(this.mapCtrl, this.getGmarker() ? this.getGmarker() : void 0);
-              return this.model.show = this.gWin.isOpen();
+              return show();
+            } else {
+              return show();
             }
           }
         };

dist/angular-google-maps.min.js

@@ -1,7 +1,7 @@
 angular.module("google-maps.directives.api.models.child".ns())
 .factory "WindowChildModel".ns(),
-  [ "BaseObject".ns(), "GmapUtil".ns(), "Logger".ns(), "$compile", "$http", "$templateCache",
-    (BaseObject, GmapUtil, $log, $compile, $http, $templateCache) ->
+  [ "BaseObject".ns(), "GmapUtil".ns(), "Logger".ns(), "$compile", "$http", "$templateCache", 'uiGmapChromeFixes',
+    (BaseObject, GmapUtil, $log, $compile, $http, $templateCache, ChromeFixes) ->
       class WindowChildModel extends BaseObject
         @include GmapUtil
         constructor: (@model, @scope, @opts, @isIconVisibleOnClick,
@@ -133,23 +133,32 @@ angular.module("google-maps.directives.api.models.child".ns())
 
         showWindow: =>
           if @gWin?
+            show = =>
+              _.defer =>
+                unless @gWin.isOpen()
+                  @gWin.open(@mapCtrl, if @getGmarker() then @getGmarker() else undefined)
+                  @model.show = @gWin.isOpen()
+                  _.defer =>
+                    ChromeFixes.maybeRepaint @gWin.content
+
             if @scope.templateUrl
               $http.get(@scope.templateUrl, { cache: $templateCache }).then (content) =>
                 templateScope = @scope.$new()
                 if angular.isDefined(@scope.templateParameter)
                   templateScope.parameter = @scope.templateParameter
                 compiled = $compile(content.data)(templateScope)
                 @gWin.setContent(compiled[0])
+                show()
+
             else if @scope.template
               templateScope = @scope.$new()
               if angular.isDefined(@scope.templateParameter)
                 templateScope.parameter = @scope.templateParameter
               compiled = $compile(@scope.template)(templateScope)
               @gWin.setContent(compiled[0])
-
-            unless @gWin.isOpen()
-              @gWin.open(@mapCtrl, if @getGmarker() then @getGmarker() else undefined)
-              @model.show = @gWin.isOpen()
+              show()
+            else
+              show()
 
         hideWindow: =>
           @gWin.close() if @gWin? and @gWin.isOpen()

src/coffee/directives/api/models/child/window-child-model.coffee

@@ -0,0 +1,10 @@
+angular.module("google-maps.directives.api.utils".ns())
+  .factory "ChromeFixes".ns(), [->
+    maybeRepaint: (el) ->
+      if el
+        od = el.style.display
+        el.style.display = 'none'
+        _.defer ->
+          el.style.display = od
+
+  ]