Merge pull request #316 from fiji-flo/fix-avatar-removal

fix avatar editing

Author: fiji-flo

src/components/profile/edit/EditPersonalInfo.vue

@@ -17,7 +17,11 @@
   >
     <EditPictureModal
       v-if="showPictureModal"
-      v-bind="{ picture, username: loggedInUser, staffInformation }"
+      v-bind="{
+        picture,
+        username: loggedInUser.primaryUsername,
+        staffInformation,
+      }"
       @close="showPictureModal = false"
     />
     <header class="profile__section-header" ref="header" tabindex="-1">

src/components/profile/edit/EditPictureModal.vue

@@ -17,7 +17,12 @@
           @change="handleChangeFile"
         />
       </label>
-      <button type="button" class="button button--secondary" @click="deleteImg">
+      <button
+        type="button"
+        class="button button--secondary"
+        :disabled="imgSrc === null"
+        @click="deleteImg"
+      >
         Delete Photo
       </button>
     </div>
@@ -88,7 +93,7 @@ export default {
   methods: {
     async deleteImg() {
       this.picture.value = '';
-      this.$emit('close');
+      this.imgSrc = null;
     },
     handleChangeFile(event) {
       loadImage(
@@ -110,7 +115,7 @@ export default {
       );
     },
     selectCrop() {
-      if (this.$refs.crop && !this.imgSrc) {
+      if (this.$refs.crop && this.imgSrc !== null) {
         const data = this.$refs.crop.cropper.toDataURL();
         this.resize(data);
       } else {