query selector fix + revert favicon in case of cancel and complete
Co-authored-by: timvisee <tim@visee.me>
This commit is contained in:
parent
a3e8646ea7
commit
e9b50b7682
@ -86,6 +86,7 @@ export default function(state, emitter) {
|
||||
|
||||
emitter.on('cancel', () => {
|
||||
state.transfer.cancel();
|
||||
faviconProgressbar.updateFavicon(0);
|
||||
});
|
||||
|
||||
emitter.on('addFiles', async ({ files }) => {
|
||||
@ -164,6 +165,7 @@ export default function(state, emitter) {
|
||||
state.storage.totalUploads += 1;
|
||||
const duration = Date.now() - start;
|
||||
metrics.completedUpload(archive, duration);
|
||||
faviconProgressbar.updateFavicon(0);
|
||||
|
||||
state.storage.addFile(ownedFile);
|
||||
// TODO integrate password into /upload request
|
||||
@ -267,6 +269,7 @@ export default function(state, emitter) {
|
||||
duration,
|
||||
password_protected: file.requiresPassword
|
||||
});
|
||||
faviconProgressbar.updateFavicon(0);
|
||||
} catch (err) {
|
||||
if (err.message === '0') {
|
||||
// download cancelled
|
||||
|
@ -28,16 +28,14 @@ function drawNewFavicon(progressRatio) {
|
||||
|
||||
module.exports.updateFavicon = function(progressRatio) {
|
||||
if (platform() === 'web') {
|
||||
const link = document.querySelector("link[rel*='icon']");
|
||||
const link = document.querySelector("link[rel='icon'][sizes='32x32']");
|
||||
const progress = progressRatio * 100;
|
||||
if (progress === 0 || progress === 100) {
|
||||
link.type = 'image/png';
|
||||
link.href = assets.get('favicon-32x32.png');
|
||||
document.getElementsByTagName('head')[0].appendChild(link);
|
||||
return;
|
||||
}
|
||||
|
||||
link.href = drawNewFavicon(progressRatio);
|
||||
document.getElementsByTagName('head')[0].appendChild(link);
|
||||
}
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user