diff --git a/examples/baseLayers.html b/examples/baseLayers.html
index dd01dbf61d..fd1ecaf261 100644
--- a/examples/baseLayers.html
+++ b/examples/baseLayers.html
@@ -29,7 +29,7 @@
40.428314208984375);
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0",
diff --git a/examples/canvas.html b/examples/canvas.html
index 1b4e92233f..ea02c39141 100644
--- a/examples/canvas.html
+++ b/examples/canvas.html
@@ -32,18 +32,18 @@
if (click) {
canvas.drawLine(click, this.getLonLatFromPixel(e.xy));
click = null;
- $('status').innerHTML = "";
+ OpenLayers.Util.getElement('status').innerHTML = "";
}
else {
click = this.getLonLatFromPixel(e.xy);
- $('status').innerHTML = "Point 1 stored: "+click+". Reset";
+ OpenLayers.Util.getElement('status').innerHTML = "Point 1 stored: "+click+". Reset";
}
});
}
function drawIt() {
canvas.drawLine(
- new OpenLayers.LonLat(parseFloat($('lon1').value), parseFloat($('lat1').value)),
- new OpenLayers.LonLat(parseFloat($('lon2').value), parseFloat($('lat2').value))
+ new OpenLayers.LonLat(parseFloat(OpenLayers.Util.getElement('lon1').value), parseFloat(OpenLayers.Util.getElement('lat1').value)),
+ new OpenLayers.LonLat(parseFloat(OpenLayers.Util.getElement('lon2').value), parseFloat(OpenLayers.Util.getElement('lat2').value))
);
}
// -->
diff --git a/examples/controls.html b/examples/controls.html
index 2a5fcbeb04..9fd656487d 100644
--- a/examples/controls.html
+++ b/examples/controls.html
@@ -17,7 +17,7 @@
map.addControl(new OpenLayers.Control.MouseToolbar());
map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
map.addControl(new OpenLayers.Control.Permalink());
- map.addControl(new OpenLayers.Control.Permalink($('permalink')));
+ map.addControl(new OpenLayers.Control.Permalink('permalink'));
map.addControl(new OpenLayers.Control.MousePosition());
map.addControl(new OpenLayers.Control.OverviewMap());
var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
diff --git a/examples/freemap.html b/examples/freemap.html
index d2562c4226..f2fa0ccce3 100644
--- a/examples/freemap.html
+++ b/examples/freemap.html
@@ -24,7 +24,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
var basemap = new OpenLayers.Layer.WMS( "Boston",
"http://boston.freemap.in/cgi-bin/mapserv?",
{map: '/www/freemap.in/boston/map/gmaps.map', layers: 'border,water,roads,rapid_transit,buildings', format: 'png', 'transparent': 'off'},
diff --git a/examples/georss.html b/examples/georss.html
index 938256458e..bc0e705ef5 100644
--- a/examples/georss.html
+++ b/examples/georss.html
@@ -22,11 +22,12 @@
map.addControl(new OpenLayers.Control.LayerSwitcher());
}
function addUrl() {
- var value = $('url').value;
+ var urlObj = OpenLayers.Util.getElement('url');
+ var value = urlObj.value;
var parts = value.split("/");
var newl = new OpenLayers.Layer.GeoRSS( parts[parts.length-1], value);
map.addLayer(newl);
- $("url").value = "";
+ urlObj.value = "";
}
// -->
diff --git a/examples/getfeatureinfo.html b/examples/getfeatureinfo.html
index f169b3949d..90209c3cd7 100644
--- a/examples/getfeatureinfo.html
+++ b/examples/getfeatureinfo.html
@@ -22,10 +22,10 @@ ul, li { padding-left: 0px; margin-left: 0px; }
var wms = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://world.freemap.in/cgi-bin/mapserv?map=/www/freemap.in/world/map/factbook.map", {'layers': 'factbook'} );
map.addLayer(wms);
- map.addControl(new OpenLayers.Control.Permalink($('permalink')));
+ map.addControl(new OpenLayers.Control.Permalink('permalink'));
map.zoomToMaxExtent();
map.events.register('click', map, function (e) {
- $('nodeList').innerHTML = "Loading... please wait...";
+ OpenLayers.Util.getElement('nodeList').innerHTML = "Loading... please wait...";
var url = wms.getFullRequestString({
REQUEST: "GetFeatureInfo",
EXCEPTIONS: "application/vnd.ogc.se_xml",
@@ -40,7 +40,7 @@ ul, li { padding-left: 0px; margin-left: 0px; }
Event.stop(e);
});
function setHTML(response) {
- $('nodeList').innerHTML = response.responseText;
+ OpenLayers.Util.getElement('nodeList').innerHTML = response.responseText;
}
diff --git a/examples/google.html b/examples/google.html
index d0cfc71dbd..21a66926c9 100644
--- a/examples/google.html
+++ b/examples/google.html
@@ -22,7 +22,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') ,
+ map = new OpenLayers.Map( 'map' ,
{ controls: [new OpenLayers.Control.MouseDefaults()] , 'numZoomLevels':20});
var satellite = new OpenLayers.Layer.Google( "Google Satellite" , {type: G_SATELLITE_MAP, 'maxZoomLevel':18} );
diff --git a/examples/layer-opacity.html b/examples/layer-opacity.html
index 59da7eca43..bd57cc0a9a 100644
--- a/examples/layer-opacity.html
+++ b/examples/layer-opacity.html
@@ -40,10 +40,10 @@
var maxOpacity = 0.9;
var minOpacity = 0.1;
function changeOpacity(byOpacity) {
- var newOpacity = (parseFloat($('opacity').value) + byOpacity).toFixed(1);
+ var newOpacity = (parseFloat(OpenLayers.Util.getElement('opacity').value) + byOpacity).toFixed(1);
newOpacity = Math.min(maxOpacity,
Math.max(minOpacity, newOpacity));
- $('opacity').value = newOpacity;
+ OpenLayers.Util.getElement('opacity').value = newOpacity;
shade.setOpacity(newOpacity);
}
function init(){
diff --git a/examples/lite.html b/examples/lite.html
index a0a2a71a42..d8abd1d642 100644
--- a/examples/lite.html
+++ b/examples/lite.html
@@ -16,7 +16,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
diff --git a/examples/lonlatfrompx.html b/examples/lonlatfrompx.html
index db1627ae3f..39c76efb42 100644
--- a/examples/lonlatfrompx.html
+++ b/examples/lonlatfrompx.html
@@ -25,7 +25,7 @@
map.addLayers([ol_wms]);
- OpenLayers.Event.observe($('map'),"click",mapclicked.bindAsEventListener(map));
+ OpenLayers.Event.observe(OpenLayers.Util.getElem('map'),"click",mapclicked.bindAsEventListener(map));
function mapclicked(e){
var lonlat = map.getLonLatFromPixel(e.xy);
alert("Lat: " + lonlat.lat + " (Pixel.x:" + e.xy.x + ")" + "\n" + "Lon: " + lonlat.lon + " (Pixel.y:" + e.xy.y + ")" );
diff --git a/examples/mapserver.html b/examples/mapserver.html
index fef78eebad..1adb31f2ee 100644
--- a/examples/mapserver.html
+++ b/examples/mapserver.html
@@ -16,7 +16,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.MapServer( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
diff --git a/examples/mm.html b/examples/mm.html
index 5a2da700ad..44e809815c 100644
--- a/examples/mm.html
+++ b/examples/mm.html
@@ -22,7 +22,7 @@
var map, mmlayer, layer;
function init(){
- map = new OpenLayers.Map( $('map') ,
+ map = new OpenLayers.Map( 'map' ,
{controls:[new OpenLayers.Control.MouseDefaults()]});
mmlayer = new OpenLayers.Layer.MultiMap( "MultiMap");
diff --git a/examples/multiserver.html b/examples/multiserver.html
index 37609c54b2..1cb98a41ab 100644
--- a/examples/multiserver.html
+++ b/examples/multiserver.html
@@ -16,7 +16,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
var urlArray = ["http://labs.metacarta.com/wms-c/Basic.py",
"http://monitor.metacarta.com/wms-c/Basic.py"];
diff --git a/examples/mvs.html b/examples/mvs.html
index 8693df2a15..51879d138d 100644
--- a/examples/mvs.html
+++ b/examples/mvs.html
@@ -64,7 +64,7 @@ function runMVS() {
safeArgs.marker = theArgs.marker; // TODO: Make this "safe".
// -----
- var theMVS = new OpenLayers.Map($('map'), {controls: [], maxResolution: 'auto'});
+ var theMVS = new OpenLayers.Map('map', {controls: [], maxResolution: 'auto'});
for(var i = 0; i < safeArgs.controls.length; i++) {
switch(safeArgs.controls[i]) {
case 'panzoombar':
diff --git a/examples/openstreetmap.html b/examples/openstreetmap.html
index 81043923a4..ba2c446cb8 100644
--- a/examples/openstreetmap.html
+++ b/examples/openstreetmap.html
@@ -14,7 +14,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenStreetMap WMS",
"http://tile.openstreetmap.org/ruby/wmsmod.rbx?" );
layer.setTileSize(new OpenLayers.Size(256,128));
diff --git a/examples/tms.html b/examples/tms.html
index a4832c71f8..7345a193e7 100644
--- a/examples/tms.html
+++ b/examples/tms.html
@@ -16,7 +16,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map'), {maxResolution:1.40625/2} );
+ map = new OpenLayers.Map( 'map', {maxResolution:1.40625/2} );
layer = new OpenLayers.Layer.TMS( "TMS",
"http://labs.metacarta.com/wms-c/Basic.py/", {layername: 'basic', type:'png'} );
map.addLayer(layer);
@@ -24,9 +24,15 @@
map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
}
function addTMS() {
- l=new OpenLayers.Layer.TMS($('layer').value, $('url').value, {layername: $('layer').value, type:$('type').value});
- map.addLayer(l);
- map.setBaseLayer(l);
+ l = new OpenLayers.Layer.TMS(
+ OpenLayers.Util.getElement('layer').value,
+ OpenLayers.Util.getElement('url').value,
+ {
+ 'layername': OpenLayers.Util.getElement('layer').value,
+ 'type': OpenLayers.Util.getElement('type').value
+ });
+ map.addLayer(l);
+ map.setBaseLayer(l);
}
// -->
diff --git a/examples/ve.html b/examples/ve.html
index 8c8b67da8d..f5d45e72ff 100644
--- a/examples/ve.html
+++ b/examples/ve.html
@@ -21,7 +21,7 @@
var map, velayer, layer;
function init(){
- map = new OpenLayers.Map( $('map') ,
+ map = new OpenLayers.Map( 'map' ,
{controls:[new OpenLayers.Control.MouseDefaults()]});
velayer = new OpenLayers.Layer.VirtualEarth( "VE",
diff --git a/examples/wms.html b/examples/wms.html
index a941f8a241..ac39511e5b 100644
--- a/examples/wms.html
+++ b/examples/wms.html
@@ -16,7 +16,7 @@
var map, layer;
function init(){
- map = new OpenLayers.Map( $('map') );
+ map = new OpenLayers.Map( 'map' );
layer = new OpenLayers.Layer.WMS( "OpenLayers WMS",
"http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} );
map.addLayer(layer);
diff --git a/examples/wmst.html b/examples/wmst.html
index 255c6a2280..c40e6c0ff6 100644
--- a/examples/wmst.html
+++ b/examples/wmst.html
@@ -21,7 +21,7 @@ var map,ia_wms;
"http://wms.jpl.nasa.gov/wms.cgi",
{layers: "modis,global_mosaic"});
- ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:document.getElementById('time').value});
+ ia_wms = new OpenLayers.Layer.WMS("Nexrad","http://mesonet.agron.iastate.edu/cgi-bin/wms/nexrad/n0r.cgi?",{layers:"nexrad-n0r-wmst",transparent:true,format:'image/png',time:OpenLayers.Util.getElement('time').value});
jpl_wms.setVisibility(false);
diff --git a/examples/zoomLevels.html b/examples/zoomLevels.html
index 5ef3fdac39..367de57594 100644
--- a/examples/zoomLevels.html
+++ b/examples/zoomLevels.html
@@ -32,7 +32,7 @@
controls: [new OpenLayers.Control.MouseDefaults()]
};
- map = new OpenLayers.Map( $('map') , options);
+ map = new OpenLayers.Map( 'map' , options);
map.addControl(new OpenLayers.Control.PanZoomBar());
diff --git a/lib/OpenLayers/BaseTypes.js b/lib/OpenLayers/BaseTypes.js
index 9c00d05222..45f3c855dd 100644
--- a/lib/OpenLayers/BaseTypes.js
+++ b/lib/OpenLayers/BaseTypes.js
@@ -694,42 +694,42 @@ OpenLayers.Bounds.oppositeQuadrant = function(quadrant) {
OpenLayers.Element = {
visible: function(element) {
- return $(element).style.display != 'none';
+ return OpenLayers.Util.getElement(element).style.display != 'none';
},
toggle: function() {
for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
+ var element = OpenLayers.Util.getElement(arguments[i]);
OpenLayers.Element[OpenLayers.Element.visible(element) ? 'hide' : 'show'](element);
}
},
hide: function() {
for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
+ var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = 'none';
}
},
show: function() {
for (var i = 0; i < arguments.length; i++) {
- var element = $(arguments[i]);
+ var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = '';
}
},
remove: function(element) {
- element = $(element);
+ element = OpenLayers.Util.getElement(element);
element.parentNode.removeChild(element);
},
getHeight: function(element) {
- element = $(element);
+ element = OpenLayers.Util.getElement(element);
return element.offsetHeight;
},
getDimensions: function(element) {
- element = $(element);
+ element = OpenLayers.Util.getElement(element);
if (OpenLayers.Element.getStyle(element, 'display') != 'none')
return {width: element.offsetWidth, height: element.offsetHeight};
@@ -750,7 +750,7 @@ OpenLayers.Element = {
},
getStyle: function(element, style) {
- element = $(element);
+ element = OpenLayers.Util.getElement(element);
var value = element.style[style.camelize()];
if (!value) {
if (document.defaultView && document.defaultView.getComputedStyle) {
diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js
index f6cc6508d6..0a4f83e3a6 100644
--- a/lib/OpenLayers/Control/Permalink.js
+++ b/lib/OpenLayers/Control/Permalink.js
@@ -26,7 +26,7 @@ OpenLayers.Control.Permalink.prototype =
*/
initialize: function(element, base) {
OpenLayers.Control.prototype.initialize.apply(this, arguments);
- this.element = element;
+ this.element = OpenLayers.Util.getElement(element);
if (base) {
this.base = base;
}
diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js
index bde35edfc2..c9d6f378cb 100644
--- a/lib/OpenLayers/Control/Scale.js
+++ b/lib/OpenLayers/Control/Scale.js
@@ -22,7 +22,7 @@ OpenLayers.Control.Scale.prototype =
*/
initialize: function(element) {
OpenLayers.Control.prototype.initialize.apply(this, arguments);
- this.element = element;
+ this.element = OpenLayers.Util.getElement(element);
},
/**
diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js
index 17afdfff3b..43fa2dd3b0 100644
--- a/lib/OpenLayers/Events.js
+++ b/lib/OpenLayers/Events.js
@@ -76,7 +76,7 @@ OpenLayers.Event = {
},
observe: function(elementParam, name, observer, useCapture) {
- var element = $(elementParam);
+ var element = OpenLayers.Util.getElement(elementParam);
useCapture = useCapture || false;
if (name == 'keypress' &&
@@ -88,7 +88,7 @@ OpenLayers.Event = {
},
stopObserving: function(elementParam, name, observer, useCapture) {
- var element = $(elementParam);
+ var element = OpenLayers.Util.getElement(elementParam);
useCapture = useCapture || false;
if (name == 'keypress' &&
diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js
index 31b0842052..ed93b5b0c7 100644
--- a/lib/OpenLayers/Layer/Yahoo.js
+++ b/lib/OpenLayers/Layer/Yahoo.js
@@ -68,7 +68,7 @@ OpenLayers.Layer.Yahoo.prototype =
* @private
*/
fixYahooEventPane: function() {
- var yahooEventPane = $("ygddfdiv");
+ var yahooEventPane = OpenLayers.Util.getElement("ygddfdiv");
if (yahooEventPane != null) {
if (yahooEventPane.parentNode != null)
yahooEventPane.parentNode.removeChild(yahooEventPane);
diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 4b3ea26a7b..46f3f54ce2 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -135,7 +135,7 @@ OpenLayers.Map.prototype = {
*/
initialize: function (div, options) {
- this.div = div = $(div);
+ this.div = div = OpenLayers.Util.getElement(div);
// the viewPortDiv is the outermost div we modify
var id = div.id + "_OpenLayers_ViewPort";
diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js
index 9795b6b7df..43f034ef8c 100644
--- a/lib/OpenLayers/Util.js
+++ b/lib/OpenLayers/Util.js
@@ -8,25 +8,31 @@
*/
OpenLayers.Util = new Object();
-/* from Prototype.js */
-if ($ == null) {
- var $ = function () {
- var elements = new Array();
+/**
+ * This is the old $() from prototype
+ */
+OpenLayers.Util.getElement = function() {
+ var elements = new Array();
- for (var i = 0; i < arguments.length; i++) {
+ for (var i = 0; i < arguments.length; i++) {
var element = arguments[i];
- if (typeof element == 'string')
- element = document.getElementById(element);
-
- if (arguments.length == 1)
- return element;
-
+ if (typeof element == 'string') {
+ element = document.getElementById(element);
+ }
+ if (arguments.length == 1) {
+ return element;
+ }
elements.push(element);
- }
-
- return elements;
}
-}
+ return elements;
+};
+
+/**
+ * Maintain $() from prototype
+ */
+if ($ == null) {
+ var $ = OpenLayers.Util.getElement;
+}
/* from Prototype.js */
OpenLayers.Util.extend = function(destination, source) {
diff --git a/lib/Rico/Color.js b/lib/Rico/Color.js
index bbcb3ec5cd..ec7d23dc80 100644
--- a/lib/Rico/Color.js
+++ b/lib/Rico/Color.js
@@ -110,7 +110,10 @@ shortHexCode.charAt(i));
*/
OpenLayers.Rico.Color.createColorFromBackground = function(elem) {
- var actualColor = RicoUtil.getElementsComputedStyle($(elem), "backgroundColor", "background-color");
+ var actualColor =
+ RicoUtil.getElementsComputedStyle(OpenLayers.Util.getElement(elem),
+ "backgroundColor",
+ "background-color");
if ( actualColor == "transparent" && elem.parentNode )
return OpenLayers.Rico.Color.createColorFromBackground(elem.parentNode);
diff --git a/lib/Rico/Corner.js b/lib/Rico/Corner.js
index 58995b4270..14d5d402b8 100644
--- a/lib/Rico/Corner.js
+++ b/lib/Rico/Corner.js
@@ -18,7 +18,7 @@ OpenLayers.Rico = new Object();
OpenLayers.Rico.Corner = {
round: function(e, options) {
- var e = $(e);
+ e = OpenLayers.Util.getElement(e);
this._setOptions(options);
var color = this.options.color;
diff --git a/tests/test_Control_LayerSwitcher.html b/tests/test_Control_LayerSwitcher.html
index 3ee7e9240d..08c9cb63c0 100644
--- a/tests/test_Control_LayerSwitcher.html
+++ b/tests/test_Control_LayerSwitcher.html
@@ -68,13 +68,13 @@
map.addControl(control);
- var wmsInput = $("input_" + layer.name);
+ var wmsInput = OpenLayers.Util.getElement("input_" + layer.name);
t.ok(wmsInput != null, "correctly makes an input for wms layer");
t.eq(wmsInput.type, "radio", "wms correctly made a radio button");
t.eq(wmsInput.name, "baseLayers", "wms correctly named");
t.eq(wmsInput.value, layer.name, "wms correctly valued");
- var markersInput = $("input_" + markers.name);
+ var markersInput = OpenLayers.Util.getElement("input_" + markers.name);
t.ok(markersInput != null, "correctly makes an input for markers layer");
t.eq(markersInput.type, "checkbox", "wms correctly made a radio button");
t.eq(markersInput.name, markers.name, "wms correctly named");
diff --git a/tests/test_Control_Permalink.html b/tests/test_Control_Permalink.html
index 57bf90988d..0f470cec7d 100644
--- a/tests/test_Control_Permalink.html
+++ b/tests/test_Control_Permalink.html
@@ -12,39 +12,41 @@
function test_02_Control_Permalink_updateLinks (t) {
t.plan( 2 );
- control = new OpenLayers.Control.Permalink($('permalink'));
+ control = new OpenLayers.Control.Permalink('permalink');
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
if (!map.getCenter()) map.zoomToMaxExtent();
map.addControl(control);
map.pan(5, 0);
+ var pm = OpenLayers.Util.getElement('permalink');
if (/MSIE/.test(navigator.userAgent)) {
- t.eq($('permalink').href, "?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
+ t.eq(pm.href, "?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
} else {
- t.eq($('permalink').href, location+"?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
+ t.eq(pm.href, location+"?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
}
}
function test_03_Control_Permalink_updateLinksBase (t) {
t.plan( 2 );
- control = new OpenLayers.Control.Permalink($('permalink'), "./edit.html" );
+ control = new OpenLayers.Control.Permalink('permalink', "./edit.html" );
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
if (!map.getCenter()) map.zoomToMaxExtent();
map.addControl(control);
map.pan(5, 0);
- $('edit_permalink').href = './edit.html?lat=0&lon=1.75781&zoom=2&layers=B';
- t.eq($('permalink').href, $('edit_permalink').href, "Panning sets permalink with base");
+ var edit_pm = OpenLayers.Util.getElement('edit_permalink');
+ edit_pm.href = './edit.html?lat=0&lon=1.75781&zoom=2&layers=B';
+ t.eq(OpenLayers.Util.getElement('permalink').href, edit_pm.href, "Panning sets permalink with base");
}
function test_04_Control_Permalink_noElement (t) {
t.plan( 2 );
control = new OpenLayers.Control.Permalink( );
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
map.addControl(control);
t.eq(map.controls[3].div.firstChild.nodeName, "A", "Permalink control creates div with 'a' inside." );
}
diff --git a/tests/test_Control_Scale.html b/tests/test_Control_Scale.html
index 995247730f..1c18fdcfd6 100644
--- a/tests/test_Control_Scale.html
+++ b/tests/test_Control_Scale.html
@@ -12,25 +12,26 @@
function test_02_Control_Scale_updateScale (t) {
t.plan( 4 );
- control = new OpenLayers.Control.Scale($('scale'));
+ control = new OpenLayers.Control.Scale('scale');
t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
map.zoomTo(0);
map.addControl(control);
- t.eq($('scale').innerHTML, "Scale = 1 : 443M", "Scale set by default." );
+ var scaleElem = OpenLayers.Util.getElement('scale');
+ t.eq(scaleElem.innerHTML, "Scale = 1 : 443M", "Scale set by default." );
map.zoomIn();
- t.eq($('scale').innerHTML, "Scale = 1 : 221M", "Zooming in changes scale" );
+ t.eq(scaleElem.innerHTML, "Scale = 1 : 221M", "Zooming in changes scale" );
map.baseLayer.resolutions = [OpenLayers.Util.getResolutionFromScale(110)];
map.zoomTo(0);
- t.eq($('scale').innerHTML, "Scale = 1 : 110", "Scale of 100 isn't rounded" );
+ t.eq(scaleElem.innerHTML, "Scale = 1 : 110", "Scale of 100 isn't rounded" );
}
function test_03_Control_Scale_internalScale (t) {
t.plan(2);
control = new OpenLayers.Control.Scale();
t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
map.addLayer(layer);
map.zoomTo(0);
diff --git a/tests/test_Events.html b/tests/test_Events.html
index 4e807a1370..4cc29db864 100644
--- a/tests/test_Events.html
+++ b/tests/test_Events.html
@@ -7,7 +7,7 @@
var a;
function test_01_Events_constructor (t) {
- var mapDiv = $('map');
+ var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
var browserTypes = OpenLayers.Events.prototype.BROWSER_EVENTS;
@@ -44,7 +44,7 @@
t.plan( 18 );
- var mapDiv = $('map');
+ var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
@@ -127,7 +127,7 @@
t.plan( 2 );
- var mapDiv = $('map');
+ var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
@@ -154,7 +154,7 @@
t.plan( 6 );
- var mapDiv = $('map');
+ var mapDiv = OpenLayers.Util.getElement('map');
var obj = {result: 0};
var eventTypes = ["doThingA", "doThingB", "doThingC"];
diff --git a/tests/test_Layer_Grid.html b/tests/test_Layer_Grid.html
index 394f817e23..4cfbbedb6b 100644
--- a/tests/test_Layer_Grid.html
+++ b/tests/test_Layer_Grid.html
@@ -32,7 +32,7 @@
function test_02_Layer_Grid_inittiles (t) {
t.plan( 2 );
- var map = new OpenLayers.Map($('map'));
+ var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
diff --git a/tests/test_Layer_KaMap.html b/tests/test_Layer_KaMap.html
index 570209fe33..b924cf5656 100644
--- a/tests/test_Layer_KaMap.html
+++ b/tests/test_Layer_KaMap.html
@@ -26,7 +26,7 @@
function test_02_Layer_KaMap_inittiles (t) {
t.plan( 2 );
- var map = new OpenLayers.Map($('map'));
+ var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.KaMap(name, url, params, units);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
diff --git a/tests/test_Layer_WMS.html b/tests/test_Layer_WMS.html
index 744507b98a..c07cf90c09 100644
--- a/tests/test_Layer_WMS.html
+++ b/tests/test_Layer_WMS.html
@@ -31,7 +31,7 @@
var url = "http://octo.metacarta.com/cgi-bin/mapserv";
layer = new OpenLayers.Layer.WMS(name, url, params);
- var map = new OpenLayers.Map($('map'));
+ var map = new OpenLayers.Map('map');
map.addLayer(layer);
var pixel = new OpenLayers.Pixel(5,6);
var tile = layer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
@@ -66,7 +66,7 @@
function test_03_Layer_WMS_inittiles (t) {
t.plan( 2 );
- var map = new OpenLayers.Map($('map'));
+ var map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS(name, url, params);
map.addLayer(layer);
map.setCenter(new OpenLayers.LonLat(0,0),5);
diff --git a/tests/test_Map.html b/tests/test_Map.html
index e7d5941980..d4ea0ad89a 100644
--- a/tests/test_Map.html
+++ b/tests/test_Map.html
@@ -7,7 +7,7 @@
function test_01_Map_constructor (t) {
t.plan( 9 );
- map = new OpenLayers.Map('map'); // no longer need to call $(), constructor does it
+ map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -31,7 +31,7 @@
}
function test_02_Map_center(t) {
t.plan(3);
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -44,7 +44,7 @@
}
function test_03_Map_add_layers(t) {
t.plan(6);
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var layer1 = new OpenLayers.Layer.WMS("Layer 1",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -63,14 +63,14 @@
}
function test_04_Map_options(t) {
t.plan(3);
- map = new OpenLayers.Map($('map'), {numZoomLevels: 6, maxResolution: 3.14159, theme: 'foo'});
+ map = new OpenLayers.Map('map', {numZoomLevels: 6, maxResolution: 3.14159, theme: 'foo'});
t.eq( map.numZoomLevels, 6, "map.numZoomLevels set correctly via options hashtable" );
t.eq( map.maxResolution, 3.14159, "map.maxResolution set correctly via options hashtable" );
t.eq( map.theme, 'foo', "map theme set correctly." );
}
function test_05_Map_center(t) {
t.plan(4);
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"} );
@@ -159,7 +159,7 @@
function 08_Map_px_lonlat_translation (t) {
t.plan( 6 );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"});
@@ -190,7 +190,7 @@
*/
function test_09_Map_isValidLonLat(t) {
t.plan( 3 );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -204,7 +204,7 @@
function test_10_Map_getLayer(t) {
t.plan( 2 );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
layer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -237,7 +237,7 @@
function test_10_Map_setBaseLayer(t) {
t.plan( 4 );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var wmslayer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
@@ -267,7 +267,7 @@
function test_12_Map_moveLayer (t) {
t.plan(10);
var ct = 0;
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var wmslayer = new OpenLayers.Layer.WMS('Test Layer',
"http://octo.metacarta.com/cgi-bin/mapserv",
{map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'},
@@ -305,7 +305,7 @@
function test_08_Map_setCenter(t) {
t.plan(1);
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
var baseLayer = new OpenLayers.Layer.WMS("Test Layer",
"http://octo.metacarta.com/cgi-bin/mapserv?",
{map: "/mapdata/vmap_wms.map", layers: "basic"},
@@ -319,7 +319,7 @@
function test_99_Map_destroy (t) {
t.plan( 2 );
- map = new OpenLayers.Map($('map'));
+ map = new OpenLayers.Map('map');
map.destroy();
t.eq( map.layers, null, "map.layers is null after destroy" );
t.eq( map.controls, null, "map.controls is null after destroy" );