Merge pull request #1529 from pixelfed/frontend-ui-refactor

Update ComposeModal, fixes #1527

public/mix-manifest.json

@@ -11,7 +11,7 @@
     "/js/collectioncompose.js": "/js/collectioncompose.js?id=a117b4e0b1d2fd859de5",
     "/js/collections.js": "/js/collections.js?id=93bac411f11eb701648f",
     "/js/components.js": "/js/components.js?id=7e4df37c02f12db5ef96",
-    "/js/compose.js": "/js/compose.js?id=df5bd23aef5b73027cce",
+    "/js/compose.js": "/js/compose.js?id=f3e4cdf34dfdd8331714",
     "/js/developers.js": "/js/developers.js?id=a395f12c52bb0eada6ab",
     "/js/discover.js": "/js/discover.js?id=f8da29f2b16ae5be93fd",
     "/js/hashtag.js": "/js/hashtag.js?id=b4ffe6499880acf0591c",

resources/assets/js/components/ComposeModal.vue

@@ -73,8 +73,8 @@
 						</ul>
 					</div>
 				</div>
-				<div v-if="ids.length > 0 && media[carouselCursor].type == 'Image'" class="bg-lighter p-2 row">
-					<div class="col-12">
+				<div v-if="ids.length > 0 && ['Image', 'Video'].indexOf(media[carouselCursor].type)" class="bg-lighter p-2 row">
+					<div v-if="media[carouselCursor].type == 'Image'" class="col-12">
 						<div class="form-group">
 							<input type="text" class="form-control" v-model="media[carouselCursor].alt" placeholder="Optional image description">
 						</div>
@@ -88,7 +88,7 @@
 						<button class="btn btn-outline-secondary btn-sm"><i class="fas fa-tools"></i></button>
 					</div> -->
 					<div class="col-12 text-right pt-2">
-						<button class="btn btn-outline-danger btn-sm font-weight-bold mr-1" v-on:click="deleteMedia()">Delete Photo</button>
+						<button class="btn btn-outline-danger btn-sm font-weight-bold mr-1" v-on:click="deleteMedia()">Delete Media</button>
 					</div>
 				</div>
 			</div>
@@ -380,7 +380,7 @@ export default {
 		},
 
 		deleteMedia() {
-			if(window.confirm('Are you sure you want to delete this photo?') == false) {
+			if(window.confirm('Are you sure you want to delete this media?') == false) {
 				return;
 			}
 			let id = this.media[this.carouselCursor].id;