From 51ac2b4acf6574f349a371ea6c3b9cbd9cf8b837 Mon Sep 17 00:00:00 2001 From: euzuro Date: Wed, 9 Aug 2006 03:31:06 +0000 Subject: [PATCH] remove useless or duplicate functions from Util.js -- no more: Array prepend() append() -- use push() and unshift(). clear() and indexOf() both removed as they are duplicated in Prototype.js -- all instances replaced and tests updated. git-svn-id: http://svn.openlayers.org/trunk/openlayers@1136 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Control/LayerTabs.js | 2 +- lib/OpenLayers/Control/MouseToolbar.js | 4 ++-- lib/OpenLayers/Layer/GeoRSS.js | 2 +- lib/OpenLayers/Layer/Grid.js | 14 ++++++------ lib/OpenLayers/Layer/KaMap.js | 4 ++-- lib/OpenLayers/Layer/Markers.js | 2 +- lib/OpenLayers/Layer/Text.js | 2 +- lib/OpenLayers/Tile/WFS.js | 2 +- lib/OpenLayers/Util.js | 30 -------------------------- tests/test_Util.html | 22 ++++++------------- 10 files changed, 22 insertions(+), 62 deletions(-) diff --git a/lib/OpenLayers/Control/LayerTabs.js b/lib/OpenLayers/Control/LayerTabs.js index ca7214979a..124cbc56c2 100644 --- a/lib/OpenLayers/Control/LayerTabs.js +++ b/lib/OpenLayers/Control/LayerTabs.js @@ -163,7 +163,7 @@ OpenLayers.Control.LayerTabs.prototype = // add label to div backdropLabelOuter.appendChild(backdropLabel); - this.backdrops.append(backdropLabel); + this.backdrops.push(backdropLabel); // add div to main LayerTabs Div this.div.appendChild(backdropLabelOuter); diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index 9df72d5b3c..da66443456 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -154,11 +154,11 @@ OpenLayers.Control.MouseToolbar.prototype = this.measureBoxDistance.innerHTML = distance; this.measureBoxDistance.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1; this.map.layerContainerDiv.appendChild(this.measureBoxDistance); - this.measureDivs.append(this.measureBoxDistance); + this.measureDivs.push(this.measureBoxDistance); } this.measureBox.style.zIndex = this.map.Z_INDEX_BASE["Popup"] - 1; this.map.layerContainerDiv.appendChild(this.measureBox); - this.measureDivs.append(this.measureBox); + this.measureDivs.push(this.measureBox); break; default: this.map.div.style.cursor = "move"; diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js index cd92fd4a13..1b0d78b745 100644 --- a/lib/OpenLayers/Layer/GeoRSS.js +++ b/lib/OpenLayers/Layer/GeoRSS.js @@ -102,7 +102,7 @@ OpenLayers.Layer.GeoRSS.prototype = //data['popupContentHTML'] = '

'+title+'

'+description+'

'; } var feature = new OpenLayers.Feature(this, location, data); - this.features.append(feature); + this.features.push(feature); var marker = feature.createMarker(); marker.events.register('click', feature, this.markerClick); this.addMarker(marker); diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index 9904e7046f..991474500c 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -230,7 +230,7 @@ OpenLayers.Layer.Grid.prototype = do { var row = new Array(); - this.grid.append(row); + this.grid.push(row); tileoffsetlon = startLon; tileoffsetx = startX; @@ -251,7 +251,7 @@ OpenLayers.Layer.Grid.prototype = var tile = this.addTile(tileBounds, px); tile.draw(this.alpha); - row.append(tile); + row.push(tile); tileoffsetlon += tilelon; tileoffsetx += this.tileSize.w; @@ -395,14 +395,14 @@ OpenLayers.Layer.Grid.prototype = position.y = position.y + deltaY; var newTile = this.addTile(bounds, position); newTile.draw(this.alpha); - newRow.append(newTile); + newRow.push(newTile); } if (newRow.length>0){ if (prepend) { - this.grid.prepend(newRow); + this.grid.unshift(newRow); } else { - this.grid.append(newRow); + this.grid.push(newRow); } } }, @@ -433,9 +433,9 @@ OpenLayers.Layer.Grid.prototype = newTile.draw(this.alpha); if (prepend) { - row = row.prepend(newTile); + row = row.unshift(newTile); } else { - row = row.append(newTile); + row = row.push(newTile); } } }, diff --git a/lib/OpenLayers/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js index 838a491641..253a2c0813 100644 --- a/lib/OpenLayers/Layer/KaMap.js +++ b/lib/OpenLayers/Layer/KaMap.js @@ -99,7 +99,7 @@ OpenLayers.Layer.KaMap.prototype = do { var row = new Array(); - this.grid.append(row); + this.grid.push(row); tileoffsetlon = startLon; tileoffsetx = startX; do { @@ -113,7 +113,7 @@ OpenLayers.Layer.KaMap.prototype = tileoffsety - parseInt(this.map.layerContainerDiv.style.top)) ); tile.draw((this.alpha)); - row.append(tile); + row.push(tile); tileoffsetlon += tilelon; tileoffsetx += this.tileSize.w; diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index 212b44a820..f3a102d645 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -63,7 +63,7 @@ OpenLayers.Layer.Markers.prototype = * @param {OpenLayers.Marker} marker */ addMarker: function(marker) { - this.markers.append(marker); + this.markers.push(marker); if (this.map && this.map.getExtent()) { marker.map = this.map; this.drawMarker(marker); diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js index fc4557f117..3e960d40c6 100644 --- a/lib/OpenLayers/Layer/Text.js +++ b/lib/OpenLayers/Layer/Text.js @@ -127,7 +127,7 @@ OpenLayers.Layer.Text.prototype = data['popupContentHTML'] = '

'+title+'

'+description+'

'; } var feature = new OpenLayers.Feature(this, location, data); - this.features.append(feature); + this.features.push(feature); var marker = feature.createMarker(); marker.events.register('click', feature, this.markerClick); this.addMarker(marker); diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index f722596fd7..1351dd345c 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -102,7 +102,7 @@ OpenLayers.Tile.WFS.prototype = var feature = new this.layer.featureClass(this.layer, results[i]); - this.features.append(feature); + this.features.push(feature); } }, diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index 5ff2830475..66e4eff502 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -670,42 +670,12 @@ Array.prototype.clone = function() { return clone; }; -/** -* @param {Object} item -*/ -Array.prototype.prepend = function(item) { - this.splice(0, 0, item); -}; - -/** -* @param {Object} item -*/ -Array.prototype.append = function(item){ - this[this.length] = item; -}; - /** */ Array.prototype.clear = function() { this.length = 0; }; -/** -* @param {Object} element -* -* @returns The first index of the element in the array if found. Else returns -1 -* @type int -*/ -Array.prototype.indexOf = function(element) { - var index = -1; - for(var i=0; i < this.length; i++) { - if (this[i] == element) { - index = i; - break; - } - } - return index; -} /** NOTE: Works only with integer values does *not* work with floats! * diff --git a/tests/test_Util.html b/tests/test_Util.html index 2d731076b5..660da3c166 100644 --- a/tests/test_Util.html +++ b/tests/test_Util.html @@ -30,32 +30,22 @@ } function test_03_Util_Array(t) { - t.plan( 8 ); + t.plan( 5 ); var array = new Array(1,2,3,4,5); - array.prepend(0); - t.eq( array.toString(), "0,1,2,3,4,5", "array.prepend works"); - - array.append(6); - t.eq( array.toString(), "0,1,2,3,4,5,6", "array.append works"); - array.remove(3); - t.eq( array.toString(), "0,1,2,4,5,6", "array.remove works"); + t.eq( array.toString(), "1,2,4,5", "array.remove works"); copy = array.clone(); - t.eq( copy.toString(), "0,1,2,4,5,6", "array.clone() works"); - array.append(7); - t.eq( copy.toString(), "0,1,2,4,5,6", "changing a value in the copied array doesnt affect the new array"); + t.eq( copy.toString(), "1,2,4,5", "array.clone() works"); + array.push(7); + t.eq( copy.toString(), "1,2,4,5", "changing a value in the copied array doesnt affect the new array"); - t.eq( copy.indexOf(5), 4, "indexOf function returns index of value in an array"); + t.eq( copy.indexOf(5), 3, "indexOf function returns index of value in an array"); t.eq( copy.indexOf(75), -1, "indexOf function returns -1 when element not found in array"); - array.clear(); - t.eq( array.toString(), "", "array.clear() works"); - - } function test_04_Util_createDiv(t) {