Merge pull request #2362 from pixelfed/staging

Update Timeline.vue component, fixes #2352 #2343

CHANGELOG.md

@@ -78,6 +78,7 @@
 - Updated private profiles, add context menu to mute, block or report. ([487c4ffc](https://github.com/pixelfed/pixelfed/commit/487c4ffc))
 - Updated webfinger util, fix bug preventing username with dots. ([c2d194af](https://github.com/pixelfed/pixelfed/commit/c2d194af))
 - Updated upload endpoints with MediaBlocklist checks. ([597378bf](https://github.com/pixelfed/pixelfed/commit/597378bf))
+- Updated Timeline.vue component, fixes ([#2352](https://github.com/pixelfed/pixelfed/issues/2352)) and ([#2343](https://github.com/pixelfed/pixelfed/issues/2343)). ([e134a9ac](https://github.com/pixelfed/pixelfed/commit/e134a9ac))
 
 ## [v0.10.9 (2020-04-17)](https://github.com/pixelfed/pixelfed/compare/v0.10.8...v0.10.9)
 ### Added

public/mix-manifest.json

@@ -27,5 +27,5 @@
     "/js/status.js": "/js/status.js?id=14b78a875aac8600d20a",
     "/js/story-compose.js": "/js/story-compose.js?id=8768fd0f62554e98ef10",
     "/js/theme-monokai.js": "/js/theme-monokai.js?id=3b6e62701f12b717cc5c",
-    "/js/timeline.js": "/js/timeline.js?id=259969ea820ad53ac48a"
+    "/js/timeline.js": "/js/timeline.js?id=c0c02c18d2b07ffba82e"
 }

resources/assets/js/components/Timeline.vue

@@ -27,7 +27,7 @@
 						<span class="sr-only">Loading...</span>
 					</div>
 				</div>
-				<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`">
+				<div :data-status-id="status.id" v-for="(status, index) in feed" :key="`${index}-${status.id}`" class="pt-4">
 					<div v-if="index == 0 && showTips && !loading" class="mb-4 card-tips">
 						<announcements-card v-on:show-tips="showTips = $event"></announcements-card>
 					</div>
@@ -152,6 +152,7 @@
 							<div v-else class="w-100">
 								<p class="text-center p-0 font-weight-bold text-white">Error: Problem rendering preview.</p>
 							</div>
+
 						</div>
 
 						<div class="card-body">
@@ -159,8 +160,8 @@
 								<h3 v-bind:class="[status.favourited ? 'fas fa-heart text-danger pr-3 m-0 cursor-pointer' : 'far fa-heart pr-3 m-0 like-btn text-lighter cursor-pointer']" title="Like" v-on:click="likeStatus(status, $event)"></h3>
 								<h3 v-if="!status.comments_disabled" class="far fa-comment text-lighter pr-3 m-0 cursor-pointer" title="Comment" v-on:click="commentFocus(status, $event)"></h3>
 								<h3 v-if="status.visibility == 'public'" v-bind:class="[status.reblogged ? 'fas fa-retweet pr-3 m-0 text-primary cursor-pointer' : 'fas fa-retweet pr-3 m-0 text-lighter share-btn cursor-pointer']" title="Share" v-on:click="shareStatus(status, $event)"></h3>
+								<h3 class="fas fa-expand pr-3 m-0 cursor-pointer text-lighter" v-on:click="lightbox(status)"></h3>
 								<span v-if="status.taggedPeople.length" class="float-right">
-									<!-- <h3 class="fas fa-expand pr-3 m-0 cursor-pointer text-lighter" v-on:click="lightbox(status)"></h3> -->
 									<span class="font-weight-light small" style="color:#718096">
 										<i class="far fa-user" data-toggle="tooltip" title="Tagged People"></i>
 										<span v-for="(tag, index) in status.taggedPeople" class="mr-n2">
@@ -250,7 +251,7 @@
 		</div>
 
 		<div v-if="!modes.distractionFree" class="col-md-4 col-lg-4 my-3 order-1 order-md-2 d-none d-md-block">
-			<div class="position-sticky" style="top:83px;">
+			<div>
 				<div class="mb-4">
 					<div class="card shadow-none border">
 						<div class="card-body pb-2">
@@ -528,7 +529,7 @@
 	size="md"
 	body-class="p-2 rounded">
 	<div>
-		<textarea class="form-control" rows="4" style="border: none; font-size: 18px; resize: none; white-space: nowrap;outline: none;" placeholder="Reply here ..." v-model="replyText">
+		<textarea class="form-control" rows="4" style="border: none; font-size: 18px; resize: none; white-space: pre-wrap;outline: none;" placeholder="Reply here ..." v-model="replyText">
 		</textarea>
 
 		<div class="border-top border-bottom my-2">
@@ -1203,6 +1204,8 @@
 			},
 
 			lightbox(status) {
+				window.location.href = status.media_attachments[0].url;
+				return;
 				this.lightboxMedia = status.media_attachments[0];
 				this.$refs.lightboxModal.show();
 			},