Mirrors/thelounge
2
0
Fork 0
mirror of https://github.com/thelounge/thelounge synced 2024-11-22 03:53:08 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI for "Image too large" errors

Browse source
This commit is contained in:
Jérémie Astori 2017-12-28 16:31:19 -05:00
parent 335bd803af
commit 91e3ca88bb
No known key found for this signature in database
GPG key ID: B9A4F245CD67BDE8
5 changed files with 42 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/css/style.css
View file

@ -1328,6 +1328,10 @@ kbd {
overflow: hidden;
}
#chat .toggle-type-error {
background: transparent;
}
#chat .toggle-content img {
max-width: 100%;
max-height: 128px;

10
client/js/libs/handlebars/friendlysize.js Normal file
View file

@ -0,0 +1,10 @@
"use strict";
const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
module.exports = function(size) {
// Loosely inspired from https://stackoverflow.com/a/18650828/1935861
const i = size > 0 ? Math.floor(Math.log(size) / Math.log(1024)) : 0;
const fixedSize = parseFloat((size / Math.pow(1024, i)).toFixed(1));
return `${fixedSize} ${sizes[i]}`;
};

12
client/views/msg_preview.tpl
View file

@ -29,10 +29,14 @@
</a>
{{/equal}}
{{#equal type "error"}}
<a class="toggle-text" href="{{link}}" target="_blank" rel="noopener">
<div class="head" title="{{head}}">{{head}}</div>
<div class="body" title="{{body}}">{{body}}</div>
</a>
{{#equal error "image-too-big"}}
<em>
This image is larger than {{friendlysize maxSize}} and cannot be
previewed.
<a href="{{link}}" target="_blank" rel="noopener">Click here</a>
to open it in a new window.
</em>
{{/equal}}
{{/equal}}
</div>
{{/preview}}

4
src/plugins/irc-events/link.js
View file

@ -100,8 +100,8 @@ function parse(msg, preview, res, client) {
case "image/webp":
if (res.size > (Helper.config.prefetchMaxImageSize * 1024)) {
preview.type = "error";
preview.head = "Large image";
preview.body = "Image is greater than your max image size. Click to view.";
preview.error = "image-too-big";
preview.maxSize = Helper.config.prefetchMaxImageSize * 1024;
} else {
preview.type = "image";
preview.thumb = preview.link;

18
test/client/js/libs/handlebars/friendlysizeTest.js Normal file
View file

@ -0,0 +1,18 @@
"use strict";
const expect = require("chai").expect;
const friendlysize = require("../../../../../client/js/libs/handlebars/friendlysize");
describe("friendlysize Handlebars helper", function() {
it("should render big values in human-readable version", function() {
expect(friendlysize(51200)).to.equal("50 KB");
});
it("should round with 1 digit", function() {
expect(friendlysize(1234567)).to.equal("1.2 MB");
});
it("should render special case 0 as 0 Bytes", function() {
expect(friendlysize(0)).to.equal("0 Bytes");
});
});