Merge remote-tracking branch 'openlayers/master' into vector-api

2014-01-02 18:28:30 +01:00
parent 8fb44e024b 94c22055be
commit 2342f83a48
12 changed files with 389 additions and 19 deletions
--- a/src/ol/map.js
+++ b/src/ol/map.js
@@ -1203,7 +1203,7 @@ ol.Map.prototype.updateSize = function() {
  if (goog.isNull(targetElement)) {
    this.setSize(undefined);
  } else {
-    var size = goog.style.getSize(targetElement);
+    var size = goog.style.getContentBoxSize(targetElement);
    this.setSize([size.width, size.height]);
  }
 };