From 6da5a1e9f70d8c7f3a8ea3a0739fc9f7387e2107 Mon Sep 17 00:00:00 2001 From: nicholas Date: Fri, 25 Mar 2016 18:47:44 +1300 Subject: [PATCH] Remove goog.style.getContentBoxSize --- src/ol/map.js | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/ol/map.js b/src/ol/map.js index 8dbd30f7f0..94f5020f87 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -8,7 +8,6 @@ goog.provide('ol.MapProperty'); goog.require('goog.asserts'); goog.require('goog.async.nextTick'); goog.require('goog.dom'); -goog.require('goog.style'); goog.require('goog.vec.Mat4'); goog.require('ol.Collection'); goog.require('ol.CollectionEventType'); @@ -1426,7 +1425,30 @@ ol.Map.prototype.updateSize = function() { if (!targetElement) { this.setSize(undefined); } else { - var size = goog.style.getContentBoxSize(targetElement); + var targetElementComputedStyle = window.getComputedStyle(targetElement); + var borderBoxSize = { + width: targetElement.offsetWidth, height: targetElement.offsetHeight + }; + var paddingBox = { + left: parseFloat(targetElementComputedStyle['paddingLeft']), + right: parseFloat(targetElementComputedStyle['paddingRight']), + top: parseFloat(targetElementComputedStyle['paddingTop']), + bottom: parseFloat(targetElementComputedStyle['paddingBottom']) + }; //goog.style.getPaddingBox(element); + var borderBox = { + left: parseFloat(targetElementComputedStyle['borderLeftWidth']), + right: parseFloat(targetElementComputedStyle['borderRightWidth']), + top: parseFloat(targetElementComputedStyle['borderTopWidth']), + bottom: parseFloat(targetElementComputedStyle['borderBottomWidth']) + }; //goog.style.getBorderBox(element); + var size = { + width: borderBoxSize.width - + borderBox.left - paddingBox.left - + paddingBox.right - borderBox.right, + height: borderBoxSize.height - + borderBox.top - paddingBox.top - + paddingBox.bottom - borderBox.bottom + }; this.setSize([size.width, size.height]); } };