Changeset 3534

Timestamp:

06/29/07 05:54:20 (1 year ago)

Author:

crschmidt

Message:

Commit patch for #788, "Control displayClass is not correct if CLASS_NAME
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!)

Files:

• trunk/openlayers/lib/OpenLayers/Control.js (modified) (1 diff)
• trunk/openlayers/tests/Control/test_KeyboardDefaults.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_LayerSwitcher.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_NavToolbar.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_OverviewMap.html (modified) (2 diffs)
• trunk/openlayers/tests/Control/test_PanZoom.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_PanZoomBar.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_Panel.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_Permalink.html (modified) (1 diff)
• trunk/openlayers/tests/Control/test_Scale.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control.js

@@ -53 +53 @@
-        // className in options.
-        this.displayClass = 
-".",
+/\./g, 
-        
-        OpenLayers.Util.extend(this, options);

trunk/openlayers/tests/Control/test_KeyboardDefaults.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_KeyboardDefaults_constructor (t) {
-1
+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" );
-    }
-

trunk/openlayers/tests/Control/test_LayerSwitcher.html

@@ -6 +6 @@
-
-    function test_01_Control_LayerSwitcher_constructor (t) {
-1
+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" );
-    }
-

trunk/openlayers/tests/Control/test_NavToolbar.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_NavToolbar_constructor (t) {
-3
+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" );

trunk/openlayers/tests/Control/test_OverviewMap.html

@@ -4 +4 @@
-  <script type="text/javascript"><!--
-    var map; 
-PanZoom
-1
+OverviewMap
+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" );
-    }
-PanZoom
+OverviewMap
-        t.plan( 6 );
-        map = new OpenLayers.Map('map');
@@ -24 +25 @@
-        map.destroy();
-    }
-PanZoom
+OverviewMap
-        t.plan( 10 );
-        var evt = {which: 1}; // control expects left-click

trunk/openlayers/tests/Control/test_PanZoom.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_PanZoom_constructor (t) {
-3
+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."); 

trunk/openlayers/tests/Control/test_PanZoomBar.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_PanZoomBar_constructor (t) {
-3
+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."); 

trunk/openlayers/tests/Control/test_Panel.html

@@ -4 +4 @@
-  <script type="text/javascript"><!--
-    function test_Control_Panel_constructor (t) {
-1
+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) {

trunk/openlayers/tests/Control/test_Permalink.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_Permalink_constructor (t) {
-1
+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) {

trunk/openlayers/tests/Control/test_Scale.html

@@ -5 +5 @@
-    var map; 
-    function test_01_Control_Scale_constructor (t) {
-1
+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) {