From ac1f51a19a9d93b48bf3eba26c214ba60e21da78 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 12 Dec 2007 20:17:30 +0000 Subject: [PATCH] renaming getLayersByType and getControlsByType to getLayersByClass and getControlsByClass - since controls have a type property, we want to leave room for a real getControlsByType - thanks for the review elem (closes #1153). git-svn-id: http://svn.openlayers.org/trunk/openlayers@5387 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- lib/OpenLayers/Map.js | 20 ++++++++++---------- tests/test_Map.html | 40 ++++++++++++++++++++-------------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index 8ff9b34aa9..5266ed6929 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -527,11 +527,11 @@ OpenLayers.Map = OpenLayers.Class({ }, /** - * APIMethod: getLayersByType - * Get a list of layers of a given type (CLASS_NAME). + * APIMethod: getLayersByClass + * Get a list of layers of a given class (CLASS_NAME). * * Parameter: - * match - {String | Object} A layer class name. The type can also be a + * match - {String | Object} A layer class name. The match can also be a * regular expression literal or object. In addition, it can be any * object with a method named test. For reqular expressions or other, * if type.test(layer.CLASS_NAME) evaluates to true, the layer will @@ -539,10 +539,10 @@ OpenLayers.Map = OpenLayers.Class({ * found, an empty array is returned. * * Returns: - * {Array()} A list of layers matching the given type. + * {Array()} A list of layers matching the given class. * An empty array is returned if no matches are found. */ - getLayersByType: function(match) { + getLayersByClass: function(match) { return this.getLayersBy("CLASS_NAME", match); }, @@ -568,11 +568,11 @@ OpenLayers.Map = OpenLayers.Class({ }, /** - * APIMethod: getControlsByType - * Get a list of controls of a given type (CLASS_NAME). + * APIMethod: getControlsByClass + * Get a list of controls of a given class (CLASS_NAME). * * Parameter: - * match - {String | Object} A control class name. The type can also be a + * match - {String | Object} A control class name. The match can also be a * regular expression literal or object. In addition, it can be any * object with a method named test. For reqular expressions or other, * if type.test(control.CLASS_NAME) evaluates to true, the control will @@ -580,10 +580,10 @@ OpenLayers.Map = OpenLayers.Class({ * found, an empty array is returned. * * Returns: - * {Array()} A list of controls matching the given type. + * {Array()} A list of controls matching the given class. * An empty array is returned if no matches are found. */ - getControlsByType: function(match) { + getControlsByClass: function(match) { return this.getControlsBy("CLASS_NAME", match); }, diff --git a/tests/test_Map.html b/tests/test_Map.html index e7a33a16b9..2835366ff5 100644 --- a/tests/test_Map.html +++ b/tests/test_Map.html @@ -375,12 +375,12 @@ } - function test_Map_getLayersByType(t) { + function test_Map_getLayersByClass(t) { var map = { getBy: OpenLayers.Map.prototype.getBy, getLayersBy: OpenLayers.Map.prototype.getLayersBy, - getLayersByType: OpenLayers.Map.prototype.getLayersByType, + getLayersByClass: OpenLayers.Map.prototype.getLayersByClass, layers: [ {CLASS_NAME: "foo", id: Math.random()}, {CLASS_NAME: "bar", id: Math.random()}, @@ -392,35 +392,35 @@ var cases = [ { - got: map.getLayersByType("foo"), + got: map.getLayersByClass("foo"), expected: [map.layers[0], map.layers[4]], message: "(string literal) got two layers matching type" }, { - got: map.getLayersByType("bar"), + got: map.getLayersByClass("bar"), expected: [map.layers[1]], message: "(string literal) got one layer matching type" }, { - got: map.getLayersByType("barfoo"), + got: map.getLayersByClass("barfoo"), expected: [], message: "(string literal) got empty array for no match" }, { - got: map.getLayersByType(/foo/), + got: map.getLayersByClass(/foo/), expected: [map.layers[0], map.layers[2], map.layers[3], map.layers[4]], message: "(regexp literal) got three layers containing string" }, { - got: map.getLayersByType(/foo$/), + got: map.getLayersByClass(/foo$/), expected: [map.layers[0], map.layers[4]], message: "(regexp literal) got three layers ending with string" }, { - got: map.getLayersByType(/\s/), + got: map.getLayersByClass(/\s/), expected: [map.layers[3]], message: "(regexp literal) got layer containing space" }, { - got: map.getLayersByType(new RegExp("BAR", "i")), + got: map.getLayersByClass(new RegExp("BAR", "i")), expected: [map.layers[1], map.layers[2], map.layers[3]], message: "(regexp object) got layers ignoring case" }, { - got: map.getLayersByType({test: function(str) {return str.length > 3;}}), + got: map.getLayersByClass({test: function(str) {return str.length > 3;}}), expected: [map.layers[2], map.layers[3]], message: "(custom object) got layers with type length greater than 3" } @@ -488,12 +488,12 @@ } - function test_Map_getControlsByType(t) { + function test_Map_getControlsByClass(t) { var map = { getBy: OpenLayers.Map.prototype.getBy, getControlsBy: OpenLayers.Map.prototype.getControlsBy, - getControlsByType: OpenLayers.Map.prototype.getControlsByType, + getControlsByClass: OpenLayers.Map.prototype.getControlsByClass, controls: [ {CLASS_NAME: "foo", id: Math.random()}, {CLASS_NAME: "bar", id: Math.random()}, @@ -505,35 +505,35 @@ var cases = [ { - got: map.getControlsByType("foo"), + got: map.getControlsByClass("foo"), expected: [map.controls[0], map.controls[4]], message: "(string literal) got two controls matching type" }, { - got: map.getControlsByType("bar"), + got: map.getControlsByClass("bar"), expected: [map.controls[1]], message: "(string literal) got one control matching type" }, { - got: map.getControlsByType("barfoo"), + got: map.getControlsByClass("barfoo"), expected: [], message: "(string literal) got empty array for no match" }, { - got: map.getControlsByType(/foo/), + got: map.getControlsByClass(/foo/), expected: [map.controls[0], map.controls[2], map.controls[3], map.controls[4]], message: "(regexp literal) got three controls containing string" }, { - got: map.getControlsByType(/foo$/), + got: map.getControlsByClass(/foo$/), expected: [map.controls[0], map.controls[4]], message: "(regexp literal) got three controls ending with string" }, { - got: map.getControlsByType(/\s/), + got: map.getControlsByClass(/\s/), expected: [map.controls[3]], message: "(regexp literal) got control containing space" }, { - got: map.getControlsByType(new RegExp("BAR", "i")), + got: map.getControlsByClass(new RegExp("BAR", "i")), expected: [map.controls[1], map.controls[2], map.controls[3]], message: "(regexp object) got controls ignoring case" }, { - got: map.getControlsByType({test: function(str) {return str.length > 3;}}), + got: map.getControlsByClass({test: function(str) {return str.length > 3;}}), expected: [map.controls[2], map.controls[3]], message: "(custom object) got controls with type length greater than 3" }