oss/FrankerFaceZ
oss/FrankerFaceZ
1
0
Fork 0
mirror of https://github.com/FrankerFaceZ/FrankerFaceZ.git synced 2025-08-28 17:00:54 +00:00
Code Wiki Activity

4.20.74

Browse source 
* Fixed: Bug when switching storage providers causing the provider to not change.
* Fixed: Revert changes to file picker while investigating some users being unable to select a file.
This commit is contained in:
SirStendec 2021-03-02 20:18:32 -05:00
parent add9f7a7d5
commit 715a92e298
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "frankerfacez", "name": "frankerfacez",
"author": "Dan Salvato LLC", "author": "Dan Salvato LLC",
"version": "4.20.73", "version": "4.20.74",
"description": "FrankerFaceZ is a Twitch enhancement suite.", "description": "FrankerFaceZ is a Twitch enhancement suite.",
"license": "Apache-2.0", "license": "Apache-2.0",
"scripts": { "scripts": {

3
src/modules/main_menu/components/backup-restore.vue
View file

@ -91,6 +91,9 @@ export default {
let file; let file;
try { try {
file = await openFile('application/json,application/zip'); file = await openFile('application/json,application/zip');
if ( ! file )
return;
} catch(err) { } catch(err) {
this.error_desc = this.t('setting.backup-restore.read-error', 'Unable to read file.'); this.error_desc = this.t('setting.backup-restore.read-error', 'Unable to read file.');
this.error = true; this.error = true;

2
src/settings/index.js
View file

@ -522,7 +522,7 @@ export default class SettingsManager extends Module {
} }
// Change over. // Change over.
localStorage.ffzProvider = key; localStorage.ffzProviderv2 = key;
location.reload(); location.reload();
} }

10
src/utilities/dom.js
View file

@ -205,20 +205,22 @@ export function openFile(contentType, multiple) {
let resolved = false; let resolved = false;
const focuser = () => { // TODO: Investigate this causing issues
// for some users.
/*const focuser = () => {
off(window, 'focus', focuser); off(window, 'focus', focuser);
setTimeout(() => { setTimeout(() => {
if ( ! resolved ) { if ( ! resolved ) {
resolved = true; resolved = true;
resolve(multiple ? [] : null); resolve(multiple ? [] : null);
} }
}, 500); }, 5000);
}; };
on(window, 'focus', focuser); on(window, 'focus', focuser);*/
input.onchange = () => { input.onchange = () => {
off(window, 'focus', focuser); //off(window, 'focus', focuser);
if ( ! resolved ) { if ( ! resolved ) {
resolved = true; resolved = true;
const files = Array.from(input.files); const files = Array.from(input.files);