ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5049 from marcjansen/assume-getComputedStyle

Browse Source 
Supported browsers all have getComputedStyle
This commit is contained in:
Marc Jansen
2016-03-16 11:30:06 +01:00
parent 074eff1efd 0d24be6767
commit 1c57686d1f
1 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/ol/dom/dom.js
View File

@@ -36,10 +36,9 @@ ol.dom.canUseCssTransform = (function() {
if (canUseCssTransform === undefined) { if (canUseCssTransform === undefined) {
goog.asserts.assert(document.body, goog.asserts.assert(document.body,
'document.body should not be null'); 'document.body should not be null');
if (!goog.global.getComputedStyle) { goog.asserts.assert(goog.global.getComputedStyle,
// this browser is ancient 'getComputedStyle is required (unsupported browser?)');
canUseCssTransform = false;
} else {
var el = document.createElement('P'), var el = document.createElement('P'),
has2d, has2d,
transforms = { transforms = {
@@ -61,7 +60,6 @@ ol.dom.canUseCssTransform = (function() {
canUseCssTransform = (has2d && has2d !== 'none'); canUseCssTransform = (has2d && has2d !== 'none');
} }
}
return canUseCssTransform; return canUseCssTransform;
}; };
}()); }());
@@ -79,10 +77,9 @@ ol.dom.canUseCssTransform3D = (function() {
if (canUseCssTransform3D === undefined) { if (canUseCssTransform3D === undefined) {
goog.asserts.assert(document.body, goog.asserts.assert(document.body,
'document.body should not be null'); 'document.body should not be null');
if (!goog.global.getComputedStyle) { goog.asserts.assert(goog.global.getComputedStyle,
// this browser is ancient 'getComputedStyle is required (unsupported browser?)');
canUseCssTransform3D = false;
} else {
var el = document.createElement('P'), var el = document.createElement('P'),
has3d, has3d,
transforms = { transforms = {
@@ -104,7 +101,6 @@ ol.dom.canUseCssTransform3D = (function() {
canUseCssTransform3D = (has3d && has3d !== 'none'); canUseCssTransform3D = (has3d && has3d !== 'none');
} }
}
return canUseCssTransform3D; return canUseCssTransform3D;
}; };
}()); }());
@@ -196,7 +192,7 @@ ol.dom.transformElement2D = function(element, transform, opt_precision) {
*/ */
ol.dom.outerWidth = function(element) { ol.dom.outerWidth = function(element) {
var width = element.offsetWidth; var width = element.offsetWidth;
var style = element.currentStyle || window.getComputedStyle(element); var style = element.currentStyle || goog.global.getComputedStyle(element);
width += parseInt(style.marginLeft, 10) + parseInt(style.marginRight, 10); width += parseInt(style.marginLeft, 10) + parseInt(style.marginRight, 10);
return width; return width;
@@ -212,7 +208,7 @@ ol.dom.outerWidth = function(element) {
*/ */
ol.dom.outerHeight = function(element) { ol.dom.outerHeight = function(element) {
var height = element.offsetHeight; var height = element.offsetHeight;
var style = element.currentStyle || window.getComputedStyle(element); var style = element.currentStyle || goog.global.getComputedStyle(element);
height += parseInt(style.marginTop, 10) + parseInt(style.marginBottom, 10); height += parseInt(style.marginTop, 10) + parseInt(style.marginBottom, 10);
return height; return height;