Changeset 5489
- Timestamp:
- 12/18/07 08:47:23 (1 year ago)
- Files:
-
- trunk/openlayers/tests/Layer/test_Text.html (modified) (2 diffs)
- trunk/openlayers/tests/Marker/test_Box.html (modified) (1 diff)
- trunk/openlayers/tests/test_Feature.html (modified) (1 diff)
- trunk/openlayers/tests/test_Popup.html (modified) (1 diff)
- trunk/openlayers/tests/test_Util.html (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/openlayers/tests/Layer/test_Text.html
r4356 r5489 76 76 layer.markers[1].events.triggerEvent('click', event); 77 77 t.eq(map.popups.length, 1, "1st popup gone, 2nd Popup opened correctly"); 78 t.eq(map.popups[0].contentDiv.style.overflow,"auto", "default Popup overflow correct"); 78 //Safari 3 separates style overflow into overflow-x and overflow-y 79 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 80 t.eq(map.popups[0].contentDiv.style[prop],"auto", "default Popup overflow correct"); 79 81 }); 80 82 } … … 93 95 layer.markers[0].events.triggerEvent('click', event); 94 96 t.eq(map.popups.length, 1, "Popup opened correctly"); 95 t.eq(map.popups[0].contentDiv.style.overflow,"auto", "Popup overflow read from file"); 97 //Safari 3 separates style overflow into overflow-x and overflow-y 98 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 99 t.eq(map.popups[0].contentDiv.style[prop],"auto", "Popup overflow read from file"); 96 100 layer.markers[1].events.triggerEvent('click', event); 97 101 t.eq(map.popups.length, 1, "1st popup gone, 2nd Popup opened correctly"); 98 t.eq(map.popups[0].contentDiv.style.overflow,"hidden", "Popup overflow read from file"); 102 //Safari 3 separates style overflow into overflow-x and overflow-y 103 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 104 t.eq(map.popups[0].contentDiv.style[prop],"hidden", "Popup overflow read from file"); 99 105 }); 100 106 } trunk/openlayers/tests/Marker/test_Box.html
r4059 r5489 26 26 t.ok( box.bounds.equals(bounds), "bounds object correctly set"); 27 27 t.ok( box.div != null, "div created"); 28 t.eq( box.div.style.overflow, "hidden", "div style overflow hidden"); 28 //Safari 3 separates style overflow into overflow-x and overflow-y 29 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 30 t.eq( box.div.style[prop], "hidden", "div style overflow hidden"); 29 31 t.ok( box.events != null, "events object created"); 30 32 t.eq( g_Color, borderColor, "setBorder called with correct border color"); trunk/openlayers/tests/test_Feature.html
r4927 r5489 43 43 feature = new OpenLayers.Feature(layer, lonlat, data); 44 44 popup = feature.createPopup(); 45 t.eq(popup.contentDiv.style.overflow, "auto", 'overflow on popup is correct'); 45 //Safari 3 separates style overflow into overflow-x and overflow-y 46 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 47 t.eq(popup.contentDiv.style[prop], "auto", 'overflow on popup is correct'); 46 48 } 47 49 function test_02_Feature_createMarker (t) { trunk/openlayers/tests/test_Popup.html
r4916 r5489 121 121 t.eq(contentDiv.style.height, "400px", "correct content div height"); 122 122 t.eq(contentDiv.style.position, "relative", "correct content div position"); 123 t.eq(contentDiv.style.overflow, "hidden", "correct content div overflow"); 123 //Safari 3 separates style overflow into overflow-x and overflow-y 124 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 125 t.eq(contentDiv.style[prop], "hidden", "correct content div overflow"); 124 126 t.eq(contentDiv.innerHTML, content, "correct content div content"); 125 127 trunk/openlayers/tests/test_Util.html
r5372 r5489 60 60 t.eq( div.style.position, position, "div.style.positionset correctly"); 61 61 t.ok( (div.style.border.indexOf(border) != -1), "div.style.border set correctly"); 62 t.eq( div.style.overflow, overflow, "div.style.overflow set correctly"); 62 //Safari 3 separates style overflow into overflow-x and overflow-y 63 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 64 t.eq( div.style[prop], overflow, "div.style.overflow set correctly"); 63 65 t.eq( parseFloat(div.style.opacity), opacity, "element.style.opacity set correctly"); 64 66 var filterString = 'alpha(opacity=' + (opacity * 100) + ')'; … … 83 85 t.eq( div.style.position, "absolute", "div.style.positionset correctly"); 84 86 t.eq( div.style.border, "", "div.style.border set correctly"); 85 t.eq(div.style.overflow, "", "div.style.overflow set correctly"); 87 //Safari 3 separates style overflow into overflow-x and overflow-y 88 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 89 t.eq(div.style[prop], "", "div.style.overflow set correctly"); 86 90 t.ok( !div.style.opacity, "element.style.opacity set correctly"); 87 91 t.ok( !div.style.filter, "element.style.filter set correctly"); … … 343 347 t.eq( element.style.position, position, "element.style.position set correctly"); 344 348 t.ok( (element.style.border.indexOf(border) != -1), "element.style.border set correctly"); 345 t.eq( element.style.overflow, overflow, "element.style.overflow set correctly"); 349 //Safari 3 separates style overflow into overflow-x and overflow-y 350 var prop = (OpenLayers.Util.getBrowserName() == 'safari') ? 'overflowX' : 'overflow'; 351 t.eq( element.style[prop], overflow, "element.style.overflow set correctly"); 346 352 t.eq( parseFloat(element.style.opacity), opacity, "element.style.opacity set correctly"); 347 353 var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
