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

Make XHR work for file:// urls

Browse Source 
The response status will be 0 instead of a HTTP status code for file urls,
so we need to consider a status of 0 as success too.
This commit is contained in:
Andreas Hocevar
2016-07-28 11:45:20 +02:00
parent 3d57ea45cb
commit 7da5a5ae92
4 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ol/featureloader.js
View File

@@ -41,7 +41,8 @@ ol.featureloader.loadFeaturesXhr = function(url, format, success, failure) {
* @private * @private
*/ */
xhr.onload = function(event) { xhr.onload = function(event) {
if (xhr.status >= 200 && xhr.status < 300) { // status will be 0 for file:// urls
if (!xhr.status || xhr.status >= 200 && xhr.status < 300) {
var type = format.getType(); var type = format.getType();
/** @type {Document|Node|Object|string|undefined} */ /** @type {Document|Node|Object|string|undefined} */
var source; var source;

3
src/ol/source/cartodb.js
View File

@@ -125,7 +125,8 @@ ol.source.CartoDB.prototype.initializeMap_ = function() {
*/ */
ol.source.CartoDB.prototype.handleInitResponse_ = function(paramHash, event) { ol.source.CartoDB.prototype.handleInitResponse_ = function(paramHash, event) {
var client = /** @type {XMLHttpRequest} */ (event.target); var client = /** @type {XMLHttpRequest} */ (event.target);
if (client.status >= 200 && client.status < 300) { // status will be 0 for file:// urls
if (!client.status || client.status >= 200 && client.status < 300) {
var response; var response;
try { try {
response = /** @type {CartoDBLayerInfo} */(JSON.parse(client.responseText)); response = /** @type {CartoDBLayerInfo} */(JSON.parse(client.responseText));

3
src/ol/source/tilejsonsource.js
View File

@@ -67,7 +67,8 @@ ol.inherits(ol.source.TileJSON, ol.source.TileImage);
*/ */
ol.source.TileJSON.prototype.onXHRLoad_ = function(event) { ol.source.TileJSON.prototype.onXHRLoad_ = function(event) {
var client = /** @type {XMLHttpRequest} */ (event.target); var client = /** @type {XMLHttpRequest} */ (event.target);
if (client.status >= 200 && client.status < 300) { // status will be 0 for file:// urls
if (!client.status || client.status >= 200 && client.status < 300) {
var response; var response;
try { try {
response = /** @type {TileJSON} */(JSON.parse(client.responseText)); response = /** @type {TileJSON} */(JSON.parse(client.responseText));

6
src/ol/source/tileutfgridsource.js
View File

@@ -81,7 +81,8 @@ ol.inherits(ol.source.TileUTFGrid, ol.source.Tile);
*/ */
ol.source.TileUTFGrid.prototype.onXHRLoad_ = function(event) { ol.source.TileUTFGrid.prototype.onXHRLoad_ = function(event) {
var client = /** @type {XMLHttpRequest} */ (event.target); var client = /** @type {XMLHttpRequest} */ (event.target);
if (client.status >= 200 && client.status < 300) { // status will be 0 for file:// urls
if (!client.status || client.status >= 200 && client.status < 300) {
var response; var response;
try { try {
response = /** @type {TileJSON} */(JSON.parse(client.responseText)); response = /** @type {TileJSON} */(JSON.parse(client.responseText));
@@ -457,7 +458,8 @@ ol.source.TileUTFGridTile_.prototype.loadInternal_ = function() {
*/ */
ol.source.TileUTFGridTile_.prototype.onXHRLoad_ = function(event) { ol.source.TileUTFGridTile_.prototype.onXHRLoad_ = function(event) {
var client = /** @type {XMLHttpRequest} */ (event.target); var client = /** @type {XMLHttpRequest} */ (event.target);
if (client.status >= 200 && client.status < 300) { // status will be 0 for file:// urls
if (!client.status || client.status >= 200 && client.status < 300) {
var response; var response;
try { try {
response = /** @type {!UTFGridJSON} */(JSON.parse(client.responseText)); response = /** @type {!UTFGridJSON} */(JSON.parse(client.responseText));