diff options
| author | Nasha Hiramiya <git@hiramiya.me> | 2018-08-30 21:03:00 +0100 |
|---|---|---|
| committer | Nasha Hiramiya <git@hiramiya.me> | 2018-08-30 21:03:00 +0100 |
| commit | 5deb1bf40e09c842cde1ade1d4fd074187521856 (patch) | |
| tree | 1ab7e0dc20601627896414d1bba17f0a324e9072 /src/client/app/desktop/api | |
| parent | Merge pull request #3 from syuilo/develop (diff) | |
| parent | 8.16.0 (diff) | |
| download | misskey-5deb1bf40e09c842cde1ade1d4fd074187521856.tar.gz misskey-5deb1bf40e09c842cde1ade1d4fd074187521856.tar.bz2 misskey-5deb1bf40e09c842cde1ade1d4fd074187521856.zip | |
Merge remote-tracking branch 'upstream/develop' into develop
Diffstat (limited to 'src/client/app/desktop/api')
| -rw-r--r-- | src/client/app/desktop/api/update-avatar.ts | 10 | ||||
| -rw-r--r-- | src/client/app/desktop/api/update-banner.ts | 9 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/client/app/desktop/api/update-avatar.ts b/src/client/app/desktop/api/update-avatar.ts index f07dc623f2..e9d92d1eb1 100644 --- a/src/client/app/desktop/api/update-avatar.ts +++ b/src/client/app/desktop/api/update-avatar.ts @@ -6,9 +6,9 @@ import ProgressDialog from '../views/components/progress-dialog.vue'; export default (os: OS) => { 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({ title: '%fa:info-circle% %i18n:desktop.invalid-filetype%', text: null, @@ -16,9 +16,9 @@ export default (os: OS) => { text: '%i18n:common.got-it%' }] }); - reject + reject(); } - + const w = os.new(CropWindow, { image: file, title: '%i18n:desktop.avatar-crop-title%', diff --git a/src/client/app/desktop/api/update-banner.ts b/src/client/app/desktop/api/update-banner.ts index 5af6ea88d2..e8fa35149b 100644 --- a/src/client/app/desktop/api/update-banner.ts +++ b/src/client/app/desktop/api/update-banner.ts @@ -6,10 +6,9 @@ import ProgressDialog from '../views/components/progress-dialog.vue'; export default (os: OS) => { 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({ title: '%fa:info-circle% %i18n:desktop.invalid-filetype%', text: null, @@ -17,9 +16,9 @@ export default (os: OS) => { text: '%i18n:common.got-it%' }] }); - reject + reject(); } - + const w = os.new(CropWindow, { image: file, title: '%i18n:desktop.banner-crop-title%', |