Remove goog.style.getPageOffset

This commit is contained in:
nicholas
2016-03-25 20:52:26 +13:00
committed by Nicholas L
parent 6da5a1e9f7
commit ea1c7a6551
2 changed files with 9 additions and 8 deletions
+2 -2
View File
@@ -1434,13 +1434,13 @@ ol.Map.prototype.updateSize = function() {
right: parseFloat(targetElementComputedStyle['paddingRight']), right: parseFloat(targetElementComputedStyle['paddingRight']),
top: parseFloat(targetElementComputedStyle['paddingTop']), top: parseFloat(targetElementComputedStyle['paddingTop']),
bottom: parseFloat(targetElementComputedStyle['paddingBottom']) bottom: parseFloat(targetElementComputedStyle['paddingBottom'])
}; //goog.style.getPaddingBox(element); };
var borderBox = { var borderBox = {
left: parseFloat(targetElementComputedStyle['borderLeftWidth']), left: parseFloat(targetElementComputedStyle['borderLeftWidth']),
right: parseFloat(targetElementComputedStyle['borderRightWidth']), right: parseFloat(targetElementComputedStyle['borderRightWidth']),
top: parseFloat(targetElementComputedStyle['borderTopWidth']), top: parseFloat(targetElementComputedStyle['borderTopWidth']),
bottom: parseFloat(targetElementComputedStyle['borderBottomWidth']) bottom: parseFloat(targetElementComputedStyle['borderBottomWidth'])
}; //goog.style.getBorderBox(element); };
var size = { var size = {
width: borderBoxSize.width - width: borderBoxSize.width -
borderBox.left - paddingBox.left - borderBox.left - paddingBox.left -
+7 -6
View File
@@ -5,7 +5,6 @@ goog.provide('ol.OverlayProperty');
goog.require('goog.asserts'); goog.require('goog.asserts');
goog.require('goog.dom'); goog.require('goog.dom');
goog.require('ol.events'); goog.require('ol.events');
goog.require('goog.style');
goog.require('ol.Map'); goog.require('ol.Map');
goog.require('ol.MapEventType'); goog.require('ol.MapEventType');
goog.require('ol.Object'); goog.require('ol.Object');
@@ -440,12 +439,14 @@ ol.Overlay.prototype.getRect_ = function(element, size) {
goog.asserts.assert(element, 'element should be defined'); goog.asserts.assert(element, 'element should be defined');
goog.asserts.assert(size !== undefined, 'size should be defined'); goog.asserts.assert(size !== undefined, 'size should be defined');
var offset = goog.style.getPageOffset(element); var box = element.getBoundingClientRect();
var offsetX = box.left + window.pageXOffset;
var offsetY = box.top + window.pageYOffset;
return [ return [
offset.x, offsetX,
offset.y, offsetY,
offset.x + size[0], offsetX + size[0],
offset.y + size[1] offsetY + size[1]
]; ];
}; };