natty
/
fox-send
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

query selector fix + revert favicon in case of cancel and complete 

Co-authored-by: timvisee <tim@visee.me>
This commit is contained in:
Ashesh Vidyut 2019-03-22 03:52:16 +05:30 committed by timvisee
parent a3e8646ea7
commit e9b50b7682
No known key found for this signature in database
GPG Key ID: B8DB720BC383E172
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/controller.js
View File

@ -86,6 +86,7 @@ export default function(state, emitter) {
emitter.on('cancel', () => { emitter.on('cancel', () => {
state.transfer.cancel(); state.transfer.cancel();
faviconProgressbar.updateFavicon(0);
}); });
emitter.on('addFiles', async ({ files }) => { emitter.on('addFiles', async ({ files }) => {
@ -164,6 +165,7 @@ export default function(state, emitter) {
state.storage.totalUploads += 1; state.storage.totalUploads += 1;
const duration = Date.now() - start; const duration = Date.now() - start;
metrics.completedUpload(archive, duration); metrics.completedUpload(archive, duration);
faviconProgressbar.updateFavicon(0);
state.storage.addFile(ownedFile); state.storage.addFile(ownedFile);
// TODO integrate password into /upload request // TODO integrate password into /upload request
@ -267,6 +269,7 @@ export default function(state, emitter) {
duration, duration,
password_protected: file.requiresPassword password_protected: file.requiresPassword
}); });
faviconProgressbar.updateFavicon(0);
} catch (err) { } catch (err) {
if (err.message === '0') { if (err.message === '0') {
// download cancelled // download cancelled

4
app/ui/faviconProgressbar.js
View File

@ -28,16 +28,14 @@ function drawNewFavicon(progressRatio) {
module.exports.updateFavicon = function(progressRatio) { module.exports.updateFavicon = function(progressRatio) {
if (platform() === 'web') { if (platform() === 'web') {
const link = document.querySelector("link[rel*='icon']"); const link = document.querySelector("link[rel='icon'][sizes='32x32']");
const progress = progressRatio * 100; const progress = progressRatio * 100;
if (progress === 0 || progress === 100) { if (progress === 0 || progress === 100) {
link.type = 'image/png'; link.type = 'image/png';
link.href = assets.get('favicon-32x32.png'); link.href = assets.get('favicon-32x32.png');
document.getElementsByTagName('head')[0].appendChild(link);
return; return;
} }
link.href = drawNewFavicon(progressRatio); link.href = drawNewFavicon(progressRatio);
document.getElementsByTagName('head')[0].appendChild(link);
} }
}; };