OpenLayers OpenLayers

Changeset 7609

Show
Ignore:
Timestamp:
07/30/08 12:33:03 (4 months ago)
Author:
tschaub
Message:

The Request functions now consider a request with null status as a sucessful request. This is relevant for the file 'protocol' where xhr status is never set. r=crschmidt (closes #1638)

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/openlayers/lib/OpenLayers/Request.js

    r7335 r7609  
    124124            if(request.readyState == OpenLayers.Request.XMLHttpRequest.DONE) { 
    125125                complete(request); 
    126                 if(success && request.status >= 200 && request.status < 300) { 
     126                if(success && (!request.status || 
     127                   (request.status >= 200 && request.status < 300))) { 
    127128                    success(request); 
    128129                } 
    129                 if(failure && (request.status < 200 || request.status >= 300)) { 
     130                if(failure && (request.status && 
     131                   (request.status < 200 || request.status >= 300))) { 
    130132                    failure(request); 
    131133                } 

  • trunk/openlayers/tests/Request.html

    r7340 r7609  
    2121        setup(); 
    2222 
    23         t.plan(18); 
     23        t.plan(19); 
    2424        var request, config; 
    2525        var proto = OpenLayers.Request.XMLHttpRequest.prototype; 
    …… 
    112112        config = { 
    113113            success: function(req) { 
    114                 t.ok(req.status >= 200 && req.status < 300, 
     114                t.ok(!req.status || (req.status >= 200 && req.status < 300), 
    115115                     "success callback called with " + req.status + " status"); 
    116116            }, 
    117117            failure: function(req) { 
    118                 t.ok(req.status < 200 || req.status >= 300, 
     118                t.ok(req.status && (req.status < 200 || req.status >= 300), 
    119119                     "failure callback called with " + req.status + " status"); 
    120120            } 
    …… 
    137137        // mock up status 300 (1 test) 
    138138        request.status = 300; 
     139        request.onreadystatechange(); 
     140         
     141        // mock up a status null (1 test) 
     142        request.status = null; 
    139143        request.onreadystatechange(); 
    140144