OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-14 23:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2512 from Hiramiya/avatarbannerfiletypes

Browse source 
Fix linting errors
This commit is contained in:
syuilo 2018-08-28 18:08:22 +09:00 committed by GitHub
commit 02341ceb6e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/client/app/desktop/api/update-avatar.ts
View file

@ -6,9 +6,9 @@ import ProgressDialog from '../views/components/progress-dialog.vue';
export default (os: OS) => { export default (os: OS) => {
const cropImage = file => new Promise((resolve, reject) => { const cropImage = file => new Promise((resolve, reject) => {
var regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$') const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
if(!regex.test(file.name) ) { if (!regex.test(file.name) ) {
os.apis.dialog({ os.apis.dialog({
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%', title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
text: null, text: null,
@ -16,9 +16,9 @@ export default (os: OS) => {
text: '%i18n:common.got-it%' text: '%i18n:common.got-it%'
}] }]
}); });
reject reject();
} }
const w = os.new(CropWindow, { const w = os.new(CropWindow, {
image: file, image: file,
title: '%i18n:desktop.avatar-crop-title%', title: '%i18n:desktop.avatar-crop-title%',

9
src/client/app/desktop/api/update-banner.ts
View file

@ -6,10 +6,9 @@ import ProgressDialog from '../views/components/progress-dialog.vue';
export default (os: OS) => { export default (os: OS) => {
const cropImage = file => new Promise((resolve, reject) => { const cropImage = file => new Promise((resolve, reject) => {
var regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$')
if(!regex.test(file.name) ) { const regex = RegExp('\.(jpg|jpeg|png|gif|webp|bmp|tiff)$');
if (!regex.test(file.name) ) {
os.apis.dialog({ os.apis.dialog({
title: '%fa:info-circle% %i18n:desktop.invalid-filetype%', title: '%fa:info-circle% %i18n:desktop.invalid-filetype%',
text: null, text: null,
@ -17,9 +16,9 @@ export default (os: OS) => {
text: '%i18n:common.got-it%' text: '%i18n:common.got-it%'
}] }]
}); });
reject reject();
} }
const w = os.new(CropWindow, { const w = os.new(CropWindow, {
image: file, image: file,
title: '%i18n:desktop.banner-crop-title%', title: '%i18n:desktop.banner-crop-title%',