Merge remote-tracking branch 'webp/comic-webp' into master
This commit is contained in:
@ -141,9 +141,24 @@ var createURLFromArray = function(array, mimeType) {
|
||||
kthoom.ImageFile = function(file) {
|
||||
this.filename = file.filename;
|
||||
var fileExtension = file.filename.split(".").pop().toLowerCase();
|
||||
this.mimeType = fileExtension === "png" ? "image/png" :
|
||||
(fileExtension === "jpg" || fileExtension === "jpeg") ? "image/jpeg" :
|
||||
fileExtension === "gif" ? "image/gif" : fileExtension === "svg" ? "image/xml+svg" : undefined;
|
||||
switch (fileExtension) {
|
||||
case "jpg":
|
||||
case "jpeg":
|
||||
this.mimeType = "image/jpeg";
|
||||
break;
|
||||
case "gif":
|
||||
this.mimeType = "iamge/gif";
|
||||
break;
|
||||
case "svg":
|
||||
this.mimeType = "image/svg+xml";
|
||||
break;
|
||||
case "webp":
|
||||
this.mimeType = "image/webp";
|
||||
break;
|
||||
default:
|
||||
this.mimeType = undefined;
|
||||
break;
|
||||
}
|
||||
if ( this.mimeType !== undefined) {
|
||||
this.dataURI = createURLFromArray(file.fileData, this.mimeType);
|
||||
this.data = file;
|
||||
@ -331,7 +346,7 @@ function setImage(url) {
|
||||
$("#mainText").innerHTML("<iframe style=\"width:100%;height:700px;border:0\" src=\"data:text/html," + escape(xhr.responseText) + "\"></iframe>");
|
||||
};
|
||||
xhr.send(null);
|
||||
} else if (!/(jpg|jpeg|png|gif)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10 * 1024) {
|
||||
} else if (!/(jpg|jpeg|png|gif|webp)$/.test(imageFiles[currentImage].filename) && imageFiles[currentImage].data.uncompressedSize < 10 * 1024) {
|
||||
xhr.open("GET", url, true);
|
||||
xhr.onload = function() {
|
||||
$("#mainText").css("display", "");
|
||||
|
Reference in New Issue
Block a user