yetangitu/epub.js
1
0
Fork 0
mirror of https://github.com/futurepress/epub.js.git synced 2025-10-05 15:32:55 +02:00
Code Issues Releases Wiki Activity

Merge pull request #292 from futurepress/request_html

Browse source 
Updates Request to detect file types
This commit is contained in:
Fred Chasen 2015-10-24 13:01:25 -04:00
commit 93f51eff04
11 changed files with 254 additions and 190 deletions
Download patch file Download diff file Expand all files Collapse all files

144
build/epub.js
View file

@ -2199,7 +2199,7 @@ EPUBJS.Book.prototype.loadChange = function(url){
EPUBJS.Book.prototype.unlistenToRenderer = function(renderer){
renderer.Events.forEach(function(eventName){
renderer.off(eventName);
} );
});
};
//-- Choose between a request from store or a request from network
@ -3012,7 +3012,7 @@ EPUBJS.Chapter.prototype.load = function(_store, _credentials){
if(store){
promise = store.getXml(this.absolute);
}else{
promise = EPUBJS.core.request(this.absolute, 'xml', credentials);
promise = EPUBJS.core.request(this.absolute, false, credentials);
}
promise.then(function(xml){
@ -3070,15 +3070,6 @@ EPUBJS.Chapter.prototype.url = function(_store){
url = this.absolute;
deferred.resolve(url);
}
/*
loaded = EPUBJS.core.request(url, 'xml', false);
loaded.then(function(contents){
chapter.contents = contents;
deferred.resolve(chapter.absolute);
}, function(error){
deferred.reject(error);
});
*/
return deferred.promise;
};
@ -3394,26 +3385,86 @@ EPUBJS.core.getEls = function(classes) {
EPUBJS.core.request = function(url, type, withCredentials) {
var supportsURL = window.URL;
var BLOB_RESPONSE = supportsURL ? "blob" : "arraybuffer";
var deferred = new RSVP.defer();
var xhr = new XMLHttpRequest();
var uri;
//-- Check from PDF.js:
// https://github.com/mozilla/pdf.js/blob/master/web/compatibility.js
var xhrPrototype = XMLHttpRequest.prototype;
var handler = function() {
var r;
if (this.readyState != this.DONE) return;
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'xhtml'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xhtml+xml");
} else {
r = this.responseXML;
}
}else
if(type == 'html'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/html");
} else {
r = this.responseXML;
}
} else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
};
if (!('overrideMimeType' in xhrPrototype)) {
// IE10 might have response, but not overrideMimeType
Object.defineProperty(xhrPrototype, 'overrideMimeType', {
value: function xmlHttpRequestOverrideMimeType(mimeType) {}
});
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
if(withCredentials) {
xhr.withCredentials = true;
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
// If type isn't set, determine it from the file extension
if(!type) {
uri = EPUBJS.core.uri(url);
type = uri.extension;
}
if(type == 'blob'){
xhr.responseType = BLOB_RESPONSE;
@ -3424,56 +3475,24 @@ EPUBJS.core.request = function(url, type, withCredentials) {
}
if(type == 'xml') {
xhr.overrideMimeType('text/xml');
xhr.responseType = "document";
xhr.overrideMimeType('text/xml'); // for OPF parsing
}
if(type == 'xhtml') {
xhr.responseType = "document";
}
if(type == 'html') {
xhr.responseType = "document";
}
if(type == "binary") {
xhr.responseType = "arraybuffer";
}
xhr.send();
function handler() {
if (this.readyState === this.DONE) {
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
var r;
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
}
}
return deferred.promise;
};
@ -3979,6 +3998,7 @@ EPUBJS.core.values = function(object) {
}
return result;
};
EPUBJS.EpubCFI = function(cfiStr){
if(cfiStr) return this.parse(cfiStr);
};
@ -7624,7 +7644,8 @@ EPUBJS.Unarchiver.prototype.getXml = function(url, encoding){
return this.getText(decodededUrl, encoding).
then(function(text){
var parser = new DOMParser();
return parser.parseFromString(text, "text/xml");
var mimeType = EPUBJS.core.getMimeType(url);
return parser.parseFromString(text, mimeType);
});
};
@ -7637,7 +7658,7 @@ EPUBJS.Unarchiver.prototype.getUrl = function(url, mime){
var _URL = window.URL || window.webkitURL || window.mozURL;
var tempUrl;
var blob;
if(!entry) {
deferred.reject({
message : "File not found in the epub: " + url,
@ -7743,7 +7764,7 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
"rdf+xml" : "rdf",
"smil" : [ "smi", "smil" ],
"xhtml+xml" : [ "xhtml", "xht" ],
"xml" : [ "xml", "xsl", "xsd" ],
"xml" : [ "xml", "xsl", "xsd", "opf" ],
"zip" : "zip",
"x-httpd-eruby" : "rhtml",
"x-latex" : "latex",
@ -7759,7 +7780,7 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
"mathml+xml" : "mathml",
"metalink+xml" : "metalink",
"mp4" : "mp4s",
"oebps-package+xml" : "opf",
// "oebps-package+xml" : "opf",
"omdoc+xml" : "omdoc",
"oxps" : "oxps",
"vnd.amazon.ebook" : "azw",
@ -7925,4 +7946,5 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
};
})();
//# sourceMappingURL=epub.js.map

2
build/epub.js.map
View file

File diff suppressed because one or more lines are too long

4
build/epub.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
build/epub.min.map
View file

File diff suppressed because one or more lines are too long

6
libs/mime-types/mime-types.js
View file

@ -14,7 +14,7 @@
"rdf+xml" : "rdf",
"smil" : [ "smi", "smil" ],
"xhtml+xml" : [ "xhtml", "xht" ],
"xml" : [ "xml", "xsl", "xsd" ],
"xml" : [ "xml", "xsl", "xsd", "opf" ],
"zip" : "zip",
"x-httpd-eruby" : "rhtml",
"x-latex" : "latex",
@ -30,7 +30,7 @@
"mathml+xml" : "mathml",
"metalink+xml" : "metalink",
"mp4" : "mp4s",
"oebps-package+xml" : "opf",
// "oebps-package+xml" : "opf",
"omdoc+xml" : "omdoc",
"oxps" : "oxps",
"vnd.amazon.ebook" : "azw",
@ -195,4 +195,4 @@
return filename && mimeTypes[filename.split(".").pop().toLowerCase()] || defaultValue;
};
})();
})();

2
reader/js/epub.js.map
View file

File diff suppressed because one or more lines are too long

144
reader/js/epub.min.js vendored
View file

@ -2199,7 +2199,7 @@ EPUBJS.Book.prototype.loadChange = function(url){
EPUBJS.Book.prototype.unlistenToRenderer = function(renderer){
renderer.Events.forEach(function(eventName){
renderer.off(eventName);
} );
});
};
//-- Choose between a request from store or a request from network
@ -3012,7 +3012,7 @@ EPUBJS.Chapter.prototype.load = function(_store, _credentials){
if(store){
promise = store.getXml(this.absolute);
}else{
promise = EPUBJS.core.request(this.absolute, 'xml', credentials);
promise = EPUBJS.core.request(this.absolute, false, credentials);
}
promise.then(function(xml){
@ -3070,15 +3070,6 @@ EPUBJS.Chapter.prototype.url = function(_store){
url = this.absolute;
deferred.resolve(url);
}
/*
loaded = EPUBJS.core.request(url, 'xml', false);
loaded.then(function(contents){
chapter.contents = contents;
deferred.resolve(chapter.absolute);
}, function(error){
deferred.reject(error);
});
*/
return deferred.promise;
};
@ -3394,26 +3385,86 @@ EPUBJS.core.getEls = function(classes) {
EPUBJS.core.request = function(url, type, withCredentials) {
var supportsURL = window.URL;
var BLOB_RESPONSE = supportsURL ? "blob" : "arraybuffer";
var deferred = new RSVP.defer();
var xhr = new XMLHttpRequest();
var uri;
//-- Check from PDF.js:
// https://github.com/mozilla/pdf.js/blob/master/web/compatibility.js
var xhrPrototype = XMLHttpRequest.prototype;
var handler = function() {
var r;
if (this.readyState != this.DONE) return;
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'xhtml'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xhtml+xml");
} else {
r = this.responseXML;
}
}else
if(type == 'html'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/html");
} else {
r = this.responseXML;
}
} else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
};
if (!('overrideMimeType' in xhrPrototype)) {
// IE10 might have response, but not overrideMimeType
Object.defineProperty(xhrPrototype, 'overrideMimeType', {
value: function xmlHttpRequestOverrideMimeType(mimeType) {}
});
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
if(withCredentials) {
xhr.withCredentials = true;
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
// If type isn't set, determine it from the file extension
if(!type) {
uri = EPUBJS.core.uri(url);
type = uri.extension;
}
if(type == 'blob'){
xhr.responseType = BLOB_RESPONSE;
@ -3424,56 +3475,24 @@ EPUBJS.core.request = function(url, type, withCredentials) {
}
if(type == 'xml') {
xhr.overrideMimeType('text/xml');
xhr.responseType = "document";
xhr.overrideMimeType('text/xml'); // for OPF parsing
}
if(type == 'xhtml') {
xhr.responseType = "document";
}
if(type == 'html') {
xhr.responseType = "document";
}
if(type == "binary") {
xhr.responseType = "arraybuffer";
}
xhr.send();
function handler() {
if (this.readyState === this.DONE) {
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
var r;
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
}
}
return deferred.promise;
};
@ -3979,6 +3998,7 @@ EPUBJS.core.values = function(object) {
}
return result;
};
EPUBJS.EpubCFI = function(cfiStr){
if(cfiStr) return this.parse(cfiStr);
};
@ -7624,7 +7644,8 @@ EPUBJS.Unarchiver.prototype.getXml = function(url, encoding){
return this.getText(decodededUrl, encoding).
then(function(text){
var parser = new DOMParser();
return parser.parseFromString(text, "text/xml");
var mimeType = EPUBJS.core.getMimeType(url);
return parser.parseFromString(text, mimeType);
});
};
@ -7637,7 +7658,7 @@ EPUBJS.Unarchiver.prototype.getUrl = function(url, mime){
var _URL = window.URL || window.webkitURL || window.mozURL;
var tempUrl;
var blob;
if(!entry) {
deferred.reject({
message : "File not found in the epub: " + url,
@ -7743,7 +7764,7 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
"rdf+xml" : "rdf",
"smil" : [ "smi", "smil" ],
"xhtml+xml" : [ "xhtml", "xht" ],
"xml" : [ "xml", "xsl", "xsd" ],
"xml" : [ "xml", "xsl", "xsd", "opf" ],
"zip" : "zip",
"x-httpd-eruby" : "rhtml",
"x-latex" : "latex",
@ -7759,7 +7780,7 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
"mathml+xml" : "mathml",
"metalink+xml" : "metalink",
"mp4" : "mp4s",
"oebps-package+xml" : "opf",
// "oebps-package+xml" : "opf",
"omdoc+xml" : "omdoc",
"oxps" : "oxps",
"vnd.amazon.ebook" : "azw",
@ -7925,4 +7946,5 @@ EPUBJS.Unarchiver.prototype.toStorage = function(entries){
};
})();
//# sourceMappingURL=epub.js.map

2
src/book.js
View file

@ -540,7 +540,7 @@ EPUBJS.Book.prototype.loadChange = function(url){
EPUBJS.Book.prototype.unlistenToRenderer = function(renderer){
renderer.Events.forEach(function(eventName){
renderer.off(eventName);
} );
});
};
//-- Choose between a request from store or a request from network

11
src/chapter.js
View file

@ -31,7 +31,7 @@ EPUBJS.Chapter.prototype.load = function(_store, _credentials){
if(store){
promise = store.getXml(this.absolute);
}else{
promise = EPUBJS.core.request(this.absolute, 'xml', credentials);
promise = EPUBJS.core.request(this.absolute, false, credentials);
}
promise.then(function(xml){
@ -89,15 +89,6 @@ EPUBJS.Chapter.prototype.url = function(_store){
url = this.absolute;
deferred.resolve(url);
}
/*
loaded = EPUBJS.core.request(url, 'xml', false);
loaded.then(function(contents){
chapter.contents = contents;
deferred.resolve(chapter.absolute);
}, function(error){
deferred.reject(error);
});
*/
return deferred.promise;
};

122
src/core.js
View file

@ -14,26 +14,86 @@ EPUBJS.core.getEls = function(classes) {
EPUBJS.core.request = function(url, type, withCredentials) {
var supportsURL = window.URL;
var BLOB_RESPONSE = supportsURL ? "blob" : "arraybuffer";
var deferred = new RSVP.defer();
var xhr = new XMLHttpRequest();
var uri;
//-- Check from PDF.js:
// https://github.com/mozilla/pdf.js/blob/master/web/compatibility.js
var xhrPrototype = XMLHttpRequest.prototype;
var handler = function() {
var r;
if (this.readyState != this.DONE) return;
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'xhtml'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "application/xhtml+xml");
} else {
r = this.responseXML;
}
}else
if(type == 'html'){
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/html");
} else {
r = this.responseXML;
}
} else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
};
if (!('overrideMimeType' in xhrPrototype)) {
// IE10 might have response, but not overrideMimeType
Object.defineProperty(xhrPrototype, 'overrideMimeType', {
value: function xmlHttpRequestOverrideMimeType(mimeType) {}
});
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
if(withCredentials) {
xhr.withCredentials = true;
}
xhr.open("GET", url, true);
xhr.onreadystatechange = handler;
// If type isn't set, determine it from the file extension
if(!type) {
uri = EPUBJS.core.uri(url);
type = uri.extension;
}
if(type == 'blob'){
xhr.responseType = BLOB_RESPONSE;
@ -44,56 +104,24 @@ EPUBJS.core.request = function(url, type, withCredentials) {
}
if(type == 'xml') {
xhr.overrideMimeType('text/xml');
xhr.responseType = "document";
xhr.overrideMimeType('text/xml'); // for OPF parsing
}
if(type == 'xhtml') {
xhr.responseType = "document";
}
if(type == 'html') {
xhr.responseType = "document";
}
if(type == "binary") {
xhr.responseType = "arraybuffer";
}
xhr.send();
function handler() {
if (this.readyState === this.DONE) {
if (this.status === 200 || (this.status === 0 && this.response) ) { // Android & Firefox reporting 0 for local & blob urls
var r;
if(type == 'xml'){
// If this.responseXML wasn't set, try to parse using a DOMParser from text
if(!this.responseXML){
r = new DOMParser().parseFromString(this.response, "text/xml");
} else {
r = this.responseXML;
}
}else
if(type == 'json'){
r = JSON.parse(this.response);
}else
if(type == 'blob'){
if(supportsURL) {
r = this.response;
} else {
//-- Safari doesn't support responseType blob, so create a blob from arraybuffer
r = new Blob([this.response]);
}
}else{
r = this.response;
}
deferred.resolve(r);
} else {
deferred.reject({
message : this.response,
stack : new Error().stack
});
}
}
}
return deferred.promise;
};
@ -598,4 +626,4 @@ EPUBJS.core.values = function(object) {
result[index] = object[props[index]];
}
return result;
};
};

5
src/unarchiver.js
View file

@ -28,7 +28,8 @@ EPUBJS.Unarchiver.prototype.getXml = function(url, encoding){
return this.getText(decodededUrl, encoding).
then(function(text){
var parser = new DOMParser();
return parser.parseFromString(text, "text/xml");
var mimeType = EPUBJS.core.getMimeType(url);
return parser.parseFromString(text, mimeType);
});
};
@ -41,7 +42,7 @@ EPUBJS.Unarchiver.prototype.getUrl = function(url, mime){
var _URL = window.URL || window.webkitURL || window.mozURL;
var tempUrl;
var blob;
if(!entry) {
deferred.reject({
message : "File not found in the epub: " + url,