浏览代码

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

Frontend ui refactor
daniel 6 年之前
父节点
当前提交
c616a99d24
共有 4 个文件被更改,包括 11 次插入1 次删除
  1. 二进制
      public/js/components.js
  2. 二进制
      public/js/compose.js
  3. 二进制
      public/mix-manifest.json
  4. 11 1
      resources/assets/js/components/ComposeModal.vue

二进制
public/js/components.js


二进制
public/js/compose.js


二进制
public/mix-manifest.json


+ 11 - 1
resources/assets/js/components/ComposeModal.vue

@@ -49,7 +49,7 @@
 							<p class="text-center mb-0 font-weight-bold text-white"><i class="fas fa-plus mr-1"></i> Add Photo</p>
 						</div>
 						<div v-if="ids.length == 0" class="w-100 h-100 bg-light py-5 cursor-pointer" style="border-bottom: 1px solid #f1f1f1" v-on:click="addMedia($event)">
-							<p class="text-center mb-0 font-weight-bold p-5">Click here to add photos</p>
+							<p class="text-center mb-0 font-weight-bold p-5">{{composeMessage()}}</p>
 						</div>
 						<div v-if="ids.length > 0">
 							
@@ -527,6 +527,16 @@ export default {
 		closeModal() {
 			this.composeType = '';
 			$('#composeModal').modal('hide');
+		},
+
+		composeMessage() {
+			let config = this.config;
+			let composeType = this.composeType;
+			let video = config.uploader.media_types.includes('video/mp4');
+
+			return video ? 
+			'Click here to add photos or videos' :
+			'Click here to add photos';
 		}
 	}
 }