OpenLayers OpenLayers

Changeset 3544

Show
Ignore:
Timestamp:
06/29/07 11:41:29 (1 year ago)
Author:
crschmidt
Message:

Merge trunk to branch. This includes all changes to OpenLayers.js (manually
merged) as well as a couple other things committed this morning.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/tschaub/naturaldocs/lib/OpenLayers.js

    r3533 r3544  
    33 * for the full text of the license. */ 
    44 
    5 /** 
     5/*  
    66 * @requires OpenLayers/BaseTypes.js 
    7  */ 
     7 */  
     8 
    89(function() { 
    910    /** 
    …… 
    1415     */ 
    1516    var singleFile = (typeof OpenLayers == "object" && OpenLayers.singleFile); 
     17     
    1618    /** 
    1719     * Namespace: OpenLayers 
    …… 
    5052            } 
    5153            return scriptLocation; 
    52         } 
     54        } 
    5355    }; 
    54  
    5556    /** 
    5657     * OpenLayers.singleFile is a flag indicating this file is being included 
    …… 
    6263     * When we *are* part of a SFL build we do not dynamically include the  
    6364     * OpenLayers library code as it will be appended at the end of this file. 
    64      */ 
     65      */ 
    6566    if(!singleFile) { 
    6667        var jsfiles = new Array( 
    …… 
    103104            "OpenLayers/Layer/GeoRSS.js", 
    104105            "OpenLayers/Layer/Boxes.js", 
    105             "OpenLayers/Layer/Canvas.js", 
    106106            "OpenLayers/Layer/TMS.js", 
    107107            "OpenLayers/Popup/Anchored.js", 
    …… 
    164164        ); // etc. 
    165165 
     166 
     167 
    166168        var allScriptTags = ""; 
    167169        var host = OpenLayers._getScriptLocation() + "lib/"; 

  • sandbox/tschaub/naturaldocs/lib/OpenLayers/Control.js

    r3522 r3544  
    7373        // className in options. 
    7474        this.displayClass =  
    75             this.CLASS_NAME.replace("OpenLayers.", "ol").replace(".",""); 
     75            this.CLASS_NAME.replace("OpenLayers.", "ol").replace(/\./g, ""); 
    7676         
    7777        OpenLayers.Util.extend(this, options); 

  • sandbox/tschaub/naturaldocs/tests/Control/test_KeyboardDefaults.html

    r3024 r3544  
    55    var map;  
    66    function test_01_Control_KeyboardDefaults_constructor (t) { 
    7         t.plan( 1 ); 
     7        t.plan( 2 ); 
    88     
    99        control = new OpenLayers.Control.KeyboardDefaults(); 
    1010        t.ok( control instanceof OpenLayers.Control.KeyboardDefaults,  
    1111                "new OpenLayers.Control.KeyboardDefaults returns object" ); 
     12        t.eq( control.displayClass,  "olControlKeyboardDefaults", "displayClass is correct" ); 
    1213    } 
    1314 

  • sandbox/tschaub/naturaldocs/tests/Control/test_LayerSwitcher.html

    r3288 r3544  
    66 
    77    function test_01_Control_LayerSwitcher_constructor (t) { 
    8         t.plan( 1 ); 
     8        t.plan( 2 ); 
    99     
    1010        control = new OpenLayers.Control.LayerSwitcher(); 
    1111        t.ok( control instanceof OpenLayers.Control.LayerSwitcher, "new OpenLayers.Control.LayerSwitcher returns object" ); 
     12        t.eq( control.displayClass,  "olControlLayerSwitcher", "displayClass is correct" ); 
    1213    } 
    1314 

  • sandbox/tschaub/naturaldocs/tests/Control/test_NavToolbar.html

    r2803 r3544  
    55    var map;  
    66    function test_01_Control_NavToolbar_constructor (t) { 
    7         t.plan( 3 ); 
     7        t.plan( 4 ); 
    88        control = new OpenLayers.Control.NavToolbar(); 
    99        t.ok( control instanceof OpenLayers.Control.NavToolbar, "new OpenLayers.Control.NavToolbar returns object" ); 
     10        t.eq( control.displayClass,  "olControlNavToolbar", "displayClass is correct" ); 
    1011        t.ok( control.controls[0] instanceof OpenLayers.Control.Navigation, "NavToolbar contains Control.Navigation object" ); 
    1112        t.ok( control.controls[1] instanceof OpenLayers.Control.ZoomBox, "NavToolbar contains Control.ZoomBox object" ); 

  • sandbox/tschaub/naturaldocs/tests/Control/test_OverviewMap.html

    r2978 r3544  
    44  <script type="text/javascript"><!-- 
    55    var map;  
    6     function test_01_Control_PanZoom_constructor (t) { 
    7         t.plan( 1 ); 
     6    function test_01_Control_OverviewMap_constructor (t) { 
     7        t.plan( 2 ); 
    88     
    99        control = new OpenLayers.Control.OverviewMap(); 
    1010        t.ok( control instanceof OpenLayers.Control.OverviewMap, "new OpenLayers.Control.OverviewMap returns object" ); 
     11        t.eq( control.displayClass,  "olControlOverviewMap", "displayClass is correct" ); 
    1112    } 
    12     function test_02_Control_PanZoom_addControl (t) { 
     13    function test_02_Control_OverviewMap_addControl (t) { 
    1314        t.plan( 6 ); 
    1415        map = new OpenLayers.Map('map'); 
    …… 
    2425        map.destroy(); 
    2526    } 
    26     function test_03_Control_PanZoom_control_events (t) { 
     27    function test_03_Control_OverviewMap_control_events (t) { 
    2728        t.plan( 10 ); 
    2829        var evt = {which: 1}; // control expects left-click 

  • sandbox/tschaub/naturaldocs/tests/Control/test_PanZoom.html

    r3033 r3544  
    55    var map;  
    66    function test_01_Control_PanZoom_constructor (t) { 
    7         t.plan( 3 ); 
     7        t.plan( 4 ); 
    88     
    99        control = new OpenLayers.Control.PanZoom(); 
    1010        t.ok( control instanceof OpenLayers.Control.PanZoom, "new OpenLayers.Control.PanZoom returns object" ); 
     11        t.eq( control.displayClass,  "olControlPanZoom", "displayClass is correct" ); 
    1112        control = new OpenLayers.Control.PanZoom({position: new OpenLayers.Pixel(100,100)}); 
    1213        t.eq( control.position.x, 100, "PanZoom X Set correctly.");  

  • sandbox/tschaub/naturaldocs/tests/Control/test_PanZoomBar.html

    r2965 r3544  
    55    var map;  
    66    function test_01_Control_PanZoomBar_constructor (t) { 
    7         t.plan( 3 ); 
     7        t.plan( 4 ); 
    88     
    99        control = new OpenLayers.Control.PanZoomBar({position: new OpenLayers.Pixel(100,100)}); 
    1010        t.ok( control instanceof OpenLayers.Control.PanZoomBar, "new OpenLayers.Control.PanZoomBar returns object" ); 
     11        t.eq( control.displayClass,  "olControlPanZoomBar", "displayClass is correct" ); 
    1112        t.eq( control.position.x, 100, "PanZoom X Set correctly.");  
    1213        t.eq( control.position.y, 100, "PanZoom y Set correctly.");  

  • sandbox/tschaub/naturaldocs/tests/Control/test_Panel.html

    r3481 r3544  
    44  <script type="text/javascript"><!-- 
    55    function test_Control_Panel_constructor (t) { 
    6         t.plan( 1 ); 
     6        t.plan( 2 ); 
    77     
    88        control = new OpenLayers.Control.Panel(); 
    99        t.ok( control instanceof OpenLayers.Control.Panel, "new OpenLayers.Control returns object" ); 
     10        t.eq( control.displayClass,  "olControlPanel", "displayClass is correct" ); 
    1011    } 
    1112    function test_01_Control_Panel_constructor (t) { 

  • sandbox/tschaub/naturaldocs/tests/Control/test_Permalink.html

    r2803 r3544  
    55    var map;  
    66    function test_01_Control_Permalink_constructor (t) { 
    7         t.plan( 1 ); 
     7        t.plan( 2 ); 
    88     
    99        control = new OpenLayers.Control.Permalink(); 
    1010        t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" ); 
     11        t.eq( control.displayClass,  "olControlPermalink", "displayClass is correct" ); 
    1112    } 
    1213    function test_02_Control_Permalink_updateLinks (t) { 

  • sandbox/tschaub/naturaldocs/tests/Control/test_Scale.html

    r2978 r3544  
    55    var map;  
    66    function test_01_Control_Scale_constructor (t) { 
    7         t.plan( 1 ); 
     7        t.plan( 2 ); 
    88     
    99        control = new OpenLayers.Control.Scale(); 
    1010        t.ok( control instanceof OpenLayers.Control.Scale, "new OpenLayers.Control returns object" ); 
     11        t.eq( control.displayClass,  "olControlScale", "displayClass is correct" ); 
    1112    } 
    1213    function test_02_Control_Scale_updateScale (t) { 

  • sandbox/tschaub/naturaldocs/tests/list-tests.html

    r3481 r3544  
    5454    <li>Tile/test_Image.html</li> 
    5555    <li>test_Control.html</li> 
     56    <li>Control/test_DragPan.html</li> 
    5657    <li>Control/test_OverviewMap.html</li> 
    5758    <li>Control/test_NavToolbar.html</li>