OpenLayers OpenLayers

Changeset 6158

Show
Ignore:
Timestamp:
02/08/08 20:31:37 (10 months ago)
Author:
tschaub
Message:

merge r6151:HEAD from trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • sandbox/tschaub/events/build/build.py

    r5635 r6158  
    1818 
    1919sourceDirectory = "../lib" 
    20 configFilename = "library.cfg" 
     20configFilename = "full.cfg" 
    2121outputFilename = "OpenLayers.js" 
    2222 

  • sandbox/tschaub/events/build/buildUncompressed.py

    r5633 r6158  
    77 
    88sourceDirectory = "../lib" 
    9 configFilename = "library.cfg" 
     9configFilename = "full.cfg" 
    1010outputFilename = "OpenLayers.js" 
    1111 

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

    r6125 r6158  
    156156            "OpenLayers/Control/Panel.js", 
    157157            "OpenLayers/Control/SelectFeature.js", 
     158            "OpenLayers/Control/NavigationHistory.js", 
    158159            "OpenLayers/Geometry.js", 
    159160            "OpenLayers/Geometry/Rectangle.js", 

  • sandbox/tschaub/events/lib/OpenLayers/Control/Panel.js

    r6155 r6158  
    111111     */ 
    112112    redraw: function() { 
    113         console.log('asdf'); 
    114113        this.div.innerHTML = ""; 
    115114        if (this.active) { 

  • sandbox/tschaub/events/lib/OpenLayers/Handler/Point.js

    r6011 r6158  
    152152     */ 
    153153    finalize: function() { 
    154         this.layer.renderer.clear(); 
    155         this.drawing = false; 
     154        this.cleanup("done"); 
     155    }, 
     156 
     157    /** 
     158     * APIMethod: cancel 
     159     * Finish the geometry and call the "cancel" callback. 
     160     */ 
     161    cancel: function() { 
     162        this.cleanup("cancel"); 
     163    }, 
     164     
     165    cleanup: function(callback) { 
     166        this.layer.eraseFeatures(this.point); 
    156167        this.mouseDown = false; 
    157168        this.lastDown = null; 
    158169        this.lastUp = null; 
    159         this.callback("done", [this.geometryClone()]); 
    160         this.destroyFeature(); 
    161     }, 
    162  
    163     /** 
    164      * APIMethod: cancel 
    165      * Finish the geometry and call the "cancel" callback. 
    166      */ 
    167     cancel: function() { 
    168         this.layer.renderer.clear(); 
    169         this.drawing = false; 
    170         this.mouseDown = false; 
    171         this.lastDown = null; 
    172         this.lastUp = null; 
    173         this.callback("cancel", [this.geometryClone()]); 
     170        this.callback(callback, [this.geometryClone()]); 
    174171        this.destroyFeature(); 
    175172    }, 

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

    r6125 r6158  
    8484    <li>Control/test_ModifyFeature.html</li> 
    8585    <li>Control/test_MousePosition.html</li> 
     86    <li>Control/test_NavigationHistory.html</li> 
    8687    <li>Control/test_MouseToolbar.html</li> 
    8788    <li>Control/test_Navigation.html</li> 

  • sandbox/tschaub/events/theme/default/style.css

    r6125 r6158  
    111111} 
    112112 
     113.olControlNavigationHistoryPreviousItemActive {  
     114   background-image: url("img/view_previous_on.png"); 
     115   background-repeat: no-repeat; 
     116   width:  24px; 
     117   height: 24px; 
     118} 
     119.olControlNavigationHistoryPreviousItemInactive {  
     120   background-image: url("img/view_previous_off.png"); 
     121   background-repeat: no-repeat; 
     122   width:  24px; 
     123   height: 24px; 
     124} 
     125.olControlNavigationHistoryNextItemActive {  
     126   background-image: url("img/view_next_on.png"); 
     127   background-repeat: no-repeat; 
     128   width:  24px; 
     129   height: 24px; 
     130} 
     131.olControlNavigationHistoryNextItemInactive {  
     132   background-image: url("img/view_next_off.png"); 
     133   background-repeat: no-repeat; 
     134   width:  24px; 
     135   height: 24px; 
     136} 
     137 
    113138.olControlNavToolbar .olControlNavigationItemActive {  
    114139  background-image: url("img/panning-hand-on.png");