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

Avoiding unnecessary repeated checks of navigator.userAgent. The constants added here should not be used outside the library. In the future, they should be removed from the library. r=ahocevar (closes #2911)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10868 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Tim Schaub
2010-11-03 00:10:00 +00:00
parent 89c215bba4
commit aa9112c494
27 changed files with 91 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/Util.html
+18 -18
View File
@@ -97,7 +97,7 @@
t.eq( div.style.position, position, "div.style.positionset correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
var s = border.split(' ');
t.ok(div.style.borderTopWidth == s[0] && div.style.borderTopStyle == s[1], "good default popup.border")
} else {
@@ -105,11 +105,11 @@
}
//Safari 3 separates style overflow into overflow-x and overflow-y
var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow';
var prop = (OpenLayers.BROWSER_NAME == 'safari') ? 'overflowX' : 'overflow';
t.eq( div.style[prop], overflow, "div.style.overflow set correctly");
t.eq( parseFloat(div.style.opacity), opacity, "element.style.opacity set correctly");
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq( div.style.filter, filterString, "element.style.filter set correctly");
//test defaults
@@ -130,13 +130,13 @@
t.eq( div.style.position, "absolute", "div.style.positionset correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
t.ok(div.style.borderTopWidth == '' && div.style.borderTopStyle == '', "good default popup.border")
} else {
t.eq( div.style.border, "", "div.style.border set correctly");
}
//Safari 3 separates style overflow into overflow-x and overflow-y
var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow';
var prop = (OpenLayers.BROWSER_NAME == 'safari') ? 'overflowX' : 'overflow';
t.eq(div.style[prop], "", "div.style.overflow set correctly");
t.ok( !div.style.opacity, "element.style.opacity set correctly");
t.ok( !div.style.filter, "element.style.filter set correctly");
@@ -168,7 +168,7 @@
t.eq( image.style.height, sz.h + "px", "image.style.height set correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
var s = border.split(' ');
t.ok(image.style.borderTopWidth == s[0] && image.style.borderTopStyle == s[1], "good default popup.border")
} else {
@@ -178,7 +178,7 @@
t.eq( image.style.position, position, "image.style.position set correctly");
t.eq( parseFloat(image.style.opacity), opacity, "image.style.opacity set correctly");
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq( image.style.filter, filterString, "element.style.filter set correctly");
//test defaults
@@ -369,7 +369,7 @@
filterString = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='http://www.openlayers.org/images/OpenLayers.trac.png', sizingMethod='crop') alpha(opacity=50)";
} else {
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
}
t.eq( imageDiv.style.filter, filterString, "element.style.filter set correctly");
@@ -385,7 +385,7 @@
t.eq( image.style.height, sz.h + "px", "image.style.height set correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
var s = border.split(' ');
t.ok(image.style.borderTopWidth == s[0] && image.style.borderTopStyle == s[1], "good default popup.border")
} else {
@@ -437,7 +437,7 @@
t.eq(parseFloat(element.style.opacity), opacity,
"element.style.opacity set correctly when opacity = " + opacity);
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq(element.style.filter, filterString,
"element.style.filter set correctly when opacity = " + opacity);
@@ -447,7 +447,7 @@
t.eq(parseFloat(element.style.opacity), opacity,
"element.style.opacity not changed if the value is incorrect");
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq(element.style.filter, filterString,
"element.style.filter not changed if the value is incorrect");
@@ -457,7 +457,7 @@
t.eq(parseFloat(element.style.opacity), opacity,
"element.style.opacity not changed if the value is incorrect");
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq(element.style.filter, filterString,
"element.style.filter not changed if the value is incorrect");
@@ -468,7 +468,7 @@
t.eq(element.style.opacity, '',
"element.style.opacity is removed when opacity = " + opacity);
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : '';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : '';
t.eq(element.style.filter, filterString,
"element.style.filter is removed when opacity = " + opacity);
}
@@ -498,18 +498,18 @@
t.eq( element.style.position, position, "element.style.position set correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
var s = border.split(' ');
t.ok(element.style.borderTopWidth == s[0] && element.style.borderTopStyle == s[1], "good default popup.border")
} else {
t.ok( (element.style.border.indexOf(border) != -1), "element.style.border set correctly");
}
//Safari 3 separates style overflow into overflow-x and overflow-y
var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow';
var prop = (OpenLayers.BROWSER_NAME == 'safari') ? 'overflowX' : 'overflow';
t.eq( element.style[prop], overflow, "element.style.overflow set correctly");
t.eq( parseFloat(element.style.opacity), opacity, "element.style.opacity set correctly");
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.eq( element.style.filter, filterString, "element.style.filter set correctly");
}
@@ -553,7 +553,7 @@
t.ok( true, "skipping element test outside of Mozilla");
} else {
//Safari 3 returns null for this value, which is okay
var filterString = (OpenLayers.Util.getBrowserName() == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
var filterString = (OpenLayers.BROWSER_NAME == 'safari') ? null : 'alpha(opacity=' + (opacity * 100) + ')';
t.ok( image.nodeName == "IMG", "createImage creates a valid HTMLImageElement" );
}
t.eq( imageDiv.style.filter, filterString, "element.style.filter set correctly");
@@ -563,7 +563,7 @@
t.eq( image.style.height, sz.h + "px", "image.style.height set correctly");
//Safari 3 separates the border style into separate entities when reading it
if (OpenLayers.Util.getBrowserName() == 'safari') {
if (OpenLayers.BROWSER_NAME == 'safari') {
var s = border.split(' ');
t.ok(image.style.borderTopWidth == s[0] && image.style.borderTopStyle == s[1], "good default popup.border")
} else {