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

Commit patch for #788, "Control displayClass is not correct if CLASS_NAME

Browse Source 
contains >= 2 periods"  from fredj, who is a wonderful contributor who not only
wrote code, and tests, but upgraded all the existing control tests, because he
is just that full of awesome. (Thanks Fred!) 


git-svn-id: http://svn.openlayers.org/trunk/openlayers@3534 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
crschmidt
2007-06-29 09:54:20 +00:00
parent 33c87bf3b6
commit ee326b9440
10 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/OpenLayers/Control.js
View File

@@ -52,7 +52,7 @@ OpenLayers.Control.prototype = {
// We do this before the extend so that instances can override
// className in options.
this.displayClass =
this.CLASS_NAME.replace("OpenLayers.", "ol").replace(".","");
this.CLASS_NAME.replace("OpenLayers.", "ol").replace(/\./g, "");
OpenLayers.Util.extend(this, options);

3
tests/Control/test_KeyboardDefaults.html
View File

@@ -4,11 +4,12 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_KeyboardDefaults_constructor (t) {
t.plan( 1 );
t.plan( 2 );
control = new OpenLayers.Control.KeyboardDefaults();
t.ok( control instanceof OpenLayers.Control.KeyboardDefaults,
"new OpenLayers.Control.KeyboardDefaults returns object" );
t.eq( control.displayClass, "olControlKeyboardDefaults", "displayClass is correct" );
}
function test_02_Control_KeyboardDefaults_addControl (t) {

3
tests/Control/test_LayerSwitcher.html
View File

@@ -5,10 +5,11 @@
var map;
function test_01_Control_LayerSwitcher_constructor (t) {
t.plan( 1 );
t.plan( 2 );
control = new OpenLayers.Control.LayerSwitcher();
t.ok( control instanceof OpenLayers.Control.LayerSwitcher, "new OpenLayers.Control.LayerSwitcher returns object" );
t.eq( control.displayClass, "olControlLayerSwitcher", "displayClass is correct" );
}
function test_02_Control_LayerSwitcher_draw (t) {

3
tests/Control/test_NavToolbar.html
View File

@@ -4,9 +4,10 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_NavToolbar_constructor (t) {
t.plan( 3 );
t.plan( 4 );
control = new OpenLayers.Control.NavToolbar();
t.ok( control instanceof OpenLayers.Control.NavToolbar, "new OpenLayers.Control.NavToolbar returns object" );
t.eq( control.displayClass, "olControlNavToolbar", "displayClass is correct" );
t.ok( control.controls[0] instanceof OpenLayers.Control.Navigation, "NavToolbar contains Control.Navigation object" );
t.ok( control.controls[1] instanceof OpenLayers.Control.ZoomBox, "NavToolbar contains Control.ZoomBox object" );
}

9
tests/Control/test_OverviewMap.html
View File

@@ -3,13 +3,14 @@
<script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"><!--
var map;
function test_01_Control_PanZoom_constructor (t) {
t.plan( 1 );
function test_01_Control_OverviewMap_constructor (t) {
t.plan( 2 );
control = new OpenLayers.Control.OverviewMap();
t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" );
t.eq( control.displayClass, "olControlOverviewMap", "displayClass is correct" );
}
function test_02_Control_PanZoom_addControl (t) {
function test_02_Control_OverviewMap_addControl (t) {
t.plan( 6 );
map = new OpenLayers.Map('map');
control = new OpenLayers.Control.OverviewMap();
@@ -23,7 +24,7 @@
map.destroy();
}
function test_03_Control_PanZoom_control_events (t) {
function test_03_Control_OverviewMap_control_events (t) {
t.plan( 10 );
var evt = {which: 1}; // control expects left-click
map = new OpenLayers.Map('map');

3
tests/Control/test_PanZoom.html
View File

@@ -4,10 +4,11 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_PanZoom_constructor (t) {
t.plan( 3 );
t.plan( 4 );
control = new OpenLayers.Control.PanZoom();
t.ok( control instanceof OpenLayers.Control.PanZoom, "new OpenLayers.Control.PanZoom returns object" );
t.eq( control.displayClass, "olControlPanZoom", "displayClass is correct" );
control = new OpenLayers.Control.PanZoom({position: new OpenLayers.Pixel(100,100)});
t.eq( control.position.x, 100, "PanZoom X Set correctly.");
t.eq( control.position.y, 100, "PanZoom y Set correctly.");

3
tests/Control/test_PanZoomBar.html
View File

@@ -4,10 +4,11 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_PanZoomBar_constructor (t) {
t.plan( 3 );
t.plan( 4 );
control = new OpenLayers.Control.PanZoomBar({position: new OpenLayers.Pixel(100,100)});
t.ok( control instanceof OpenLayers.Control.PanZoomBar, "new OpenLayers.Control.PanZoomBar returns object" );
t.eq( control.displayClass, "olControlPanZoomBar", "displayClass is correct" );
t.eq( control.position.x, 100, "PanZoom X Set correctly.");
t.eq( control.position.y, 100, "PanZoom y Set correctly.");
}

3
tests/Control/test_Panel.html
View File

@@ -3,10 +3,11 @@
<script src="../../lib/OpenLayers.js"></script>
<script type="text/javascript"><!--
function test_Control_Panel_constructor (t) {
t.plan( 1 );
t.plan( 2 );
control = new OpenLayers.Control.Panel();
t.ok( control instanceof OpenLayers.Control.Panel, "new OpenLayers.Control returns object" );
t.eq( control.displayClass, "olControlPanel", "displayClass is correct" );
}
function test_01_Control_Panel_constructor (t) {
t.plan(5);

3
tests/Control/test_Permalink.html
View File

@@ -4,10 +4,11 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_Permalink_constructor (t) {
t.plan( 1 );
t.plan( 2 );
control = new OpenLayers.Control.Permalink();
t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
t.eq( control.displayClass, "olControlPermalink", "displayClass is correct" );
}
function test_02_Control_Permalink_updateLinks (t) {
t.plan( 2 );

3
tests/Control/test_Scale.html
View File

@@ -4,10 +4,11 @@
<script type="text/javascript"><!--
var map;
function test_01_Control_Scale_constructor (t) {
t.plan( 1 );
t.plan( 2 );
control = new OpenLayers.Control.Scale();
t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" );
t.eq( control.displayClass, "olControlScale", "displayClass is correct" );
}
function test_02_Control_Scale_updateScale (t) {
t.plan( 4 );