Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace getJSON with pure XHR/JSON.parse implementation #45

Closed
wants to merge 2 commits into from
Closed

replace getJSON with pure XHR/JSON.parse implementation #45

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
863a4c1
replace getJSON with pure XHR/JSON.parse implementation
botsonfirst Sep 26, 2016
b1cde3d
onprogress not onprocess
botsonfirst Sep 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 62 additions & 5 deletions leaflet-iiif.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Leaflet-IIIF 0.2.0
* Leaflet-IIIF 0.2.1
* IIIF Viewer for Leaflet
* by Jack Reed, @mejackreed
*/
Expand Down Expand Up @@ -100,9 +100,7 @@ L.TileLayer.Iiif = L.TileLayer.extend({
_getInfo: function() {
var _this = this;

// Look for a way to do this without jQuery
$.getJSON(_this._infoUrl)
.done(function(data) {
var onsuccess = function(data){
_this.y = data.height;
_this.x = data.width;

Expand Down Expand Up @@ -165,7 +163,66 @@ L.TileLayer.Iiif = L.TileLayer.extend({

// Resolved Deferred to initiate tilelayer load
_this._infoDeferred.resolve();
});
};

var onload = function(rsp){

var target = rsp.target;

if (target.readyState != 4){
return;
}

var status_code = target['status'];
var status_text = target['statusText'];

var raw = target['responseText'];
var data = undefined;

try {
data = JSON.parse(raw);
}

catch (e){

console.log("Failed to parse JSON, because " + e);
console.log(raw);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there is a mix of tabs and four spaces. Mind converting over to two spaces?

return false;
}

onsuccess(data);
};

var onprocess = function(){
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be onprogress?

// pass
};

var onfailed = function(rsp){
console.log("XHR failed, because " + rsp);
};

var onabort = function(){
console.log("XHR aborted");
};

try {

var endpoint = _this._infoUrl;
var req = new XMLHttpRequest();

req.addEventListener("load", onload);
req.addEventListener("progress", onprogress);
req.addEventListener("error", onfailed);
req.addEventListener("abort", onabort);

req.open("GET", endpoint, true);
req.send();

} catch (e) {

console.log("XHR failed, because " + e);
return false;
}
},

_setQuality: function() {
Expand Down