From 457132fb378b70a630fd4dc1b723488901b95c83 Mon Sep 17 00:00:00 2001
From: rinpatch <rinpatch@sdf.org>
Date: Thu, 13 Dec 2018 15:44:37 +0100
Subject: [PATCH] get rid of slots

---
 src/components/user_settings/user_settings.js | 40 ++-----------------
 .../user_settings/user_settings.vue           | 12 +++---
 2 files changed, 9 insertions(+), 43 deletions(-)

diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js
index 0f3f0859..88cdb3bf 100644
--- a/src/components/user_settings/user_settings.js
+++ b/src/components/user_settings/user_settings.js
@@ -78,42 +78,18 @@ const UserSettings = {
     uploadFile (slot, e) {
       const file = e.target.files[0]
       if (!file) { return }
-      var error = () => {}
-      switch (slot) {
-        case 0:
-          error = (error) => { this.avatarUploadError = error }
-          break
-        case 1:
-          error = (error) => { this.bannerUploadError = error }
-          break
-        case 2:
-          error = (error) => { this.backgroundUploadError = error }
-          break
-      }
       var limit = [this.$store.state.instance.avatarlimit, this.$store.state.instance.bannerlimit, this.$store.state.instance.backgroundlimit]
       if (file.size > limit[slot]) {
         const filesize = fileSizeFormatService.fileSizeFormat(file.size)
         const allowedsize = fileSizeFormatService.fileSizeFormat(limit[slot])
-        error(this.$t('upload.error.base') + ' ' + this.$t('upload.error.file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit}))
+        this[slot + 'UploadError'] = this.$t('upload.error.base') + ' ' + this.$t('upload.error.file_too_big', {filesize: filesize.num, filesizeunit: filesize.unit, allowedsize: allowedsize.num, allowedsizeunit: allowedsize.unit})
         return
       }
       // eslint-disable-next-line no-undef
       const reader = new FileReader()
       reader.onload = ({target}) => {
         const img = target.result
-        var preview = () => {}
-        switch (slot) {
-          case 0:
-            preview = (preview) => { this.avatarPreview = preview }
-            break
-          case 1:
-            preview = (preview) => { this.bannerPreview = preview }
-            break
-          case 2:
-            preview = (preview) => { this.backgroundPreview = preview }
-            break
-        }
-        preview(img)
+        this[slot + 'Preview'] = img
       }
       reader.readAsDataURL(file)
     },
@@ -149,17 +125,7 @@ const UserSettings = {
       })
     },
     clearUploadError (slot) {
-      switch (slot) {
-        case 0:
-          this.avatarUploadError = null
-          break
-        case 1:
-          this.bannerUploadError = null
-          break
-        case 2:
-          this.backgroundUploadError = null
-          break
-      }
+      this[slot + 'UploadError'] = null
     },
     submitBanner () {
       if (!this.bannerPreview) { return }
diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index 5883775c..1a98b788 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -39,13 +39,13 @@
             <img class="new-avatar" v-bind:src="avatarPreview" v-if="avatarPreview">
             </img>
             <div>
-              <input type="file" @change="uploadFile(0, $event)" ></input>
+              <input type="file" @change="uploadFile('avatar', $event)" ></input>
             </div>
             <i class="icon-spin4 animate-spin" v-if="avatarUploading"></i>
             <button class="btn btn-default" v-else-if="avatarPreview" @click="submitAvatar">{{$t('general.submit')}}</button>
             <div class='alert error' v-if="avatarUploadError">
               Error: {{ avatarUploadError }}
-              <i class="icon-cancel" @click="clearUploadError(0)"></i>
+              <i class="icon-cancel" @click="clearUploadError('avatar')"></i>
             </div>
           </div>
           <div class="setting-item">
@@ -56,13 +56,13 @@
             <img class="banner" v-bind:src="bannerPreview" v-if="bannerPreview">
             </img>
             <div>
-              <input type="file" @change="uploadFile(1, $event)" ></input>
+              <input type="file" @change="uploadFile('banner', $event)" ></input>
             </div>
             <i class=" icon-spin4 animate-spin uploading" v-if="bannerUploading"></i>
             <button class="btn btn-default" v-else-if="bannerPreview" @click="submitBanner">{{$t('general.submit')}}</button>
             <div class='alert error' v-if="bannerUploadError">
               Error: {{ bannerUploadError }}
-              <i class="icon-cancel" @click="clearUploadError(1)"></i>
+              <i class="icon-cancel" @click="clearUploadError('banner')"></i>
             </div>
           </div>
           <div class="setting-item">
@@ -71,13 +71,13 @@
             <img class="bg" v-bind:src="backgroundPreview" v-if="backgroundPreview">
             </img>
             <div>
-              <input type="file" @change="uploadFile(2, $event)" ></input>
+              <input type="file" @change="uploadFile('background', $event)" ></input>
             </div>
             <i class=" icon-spin4 animate-spin uploading" v-if="backgroundUploading"></i>
             <button class="btn btn-default" v-else-if="backgroundPreview" @click="submitBg">{{$t('general.submit')}}</button>
             <div class='alert error' v-if="backgroundUploadError">
               Error: {{ backgroundUploadError }}
-              <i class="icon-cancel" @click="clearUploadError(2)"></i>
+              <i class="icon-cancel" @click="clearUploadError('background')"></i>
             </div>
           </div>
         </div>