廃止 lightmode, rawImage

mei23 · Jan 13, 2020 · b529ca4 · b529ca4
1 parent 19578da
commit b529ca4
Show file tree

Hide file tree

Showing 12 changed files with 5 additions and 32 deletions.
diff --git a/locales/cs-CZ.yml b/locales/cs-CZ.yml
@@ -193,7 +193,6 @@ common:
     notification-position-bottom: "Dole"
     notification-position-top: "Nahoře"
     disable-via-mobile: "Neoznačovat příspěvky jako „z mobilu“"
-    load-raw-images: "Zobrazovat obrázky v původní kvalitě"
     load-remote-media: "Zobrazovat média ze vzdáleného serveru"
   search: "Hledání"
   delete: "Odstranit"

diff --git a/locales/en-US.yml b/locales/en-US.yml
@@ -240,7 +240,6 @@ common:
     notification-position-bottom: "Bottom"
     notification-position-top: "Top"
     disable-via-mobile: "Don't mark the post as 'from mobile'"
-    load-raw-images: "Show attached images in original quality"
     load-remote-media: "Show media from a remote server"
     sync: "Sync"
     save: "Save"

diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
@@ -251,7 +251,6 @@ common:
     notification-position-bottom: "下"
     notification-position-top: "上"
     disable-via-mobile: "「モバイルからの投稿」フラグを付けない"
-    load-raw-images: "添付された画像を高画質で表示する"
     load-remote-media: "リモートサーバーのメディアを表示する"
     sync: "同期"
     save: "保存"

diff --git a/locales/ko-KR.yml b/locales/ko-KR.yml
@@ -193,7 +193,6 @@ common:
     notification-position-bottom: "아래"
     notification-position-top: "위"
     disable-via-mobile: "작성하는 글에 \"모바일에서 작성함\" 을 붙이지 않음"
-    load-raw-images: "첨부 이미지를 고품질로 표시"
     load-remote-media: "원격 서버의 미디어를 표시"
   search: "검색"
   delete: "삭제"

diff --git a/locales/zh-CN.yml b/locales/zh-CN.yml
@@ -193,7 +193,6 @@ common:
     notification-position-bottom: "底部"
     notification-position-top: "顶部"
     disable-via-mobile: "不要将帖子标记为“来自手机”"
-    load-raw-images: "以原始质量显示附加图像"
     load-remote-media: "显示来自远程服务器的媒体"
   search: "搜索"
   delete: "删除"

diff --git a/src/client/app/common/views/components/avatar.vue b/src/client/app/common/views/components/avatar.vue
@@ -37,9 +37,6 @@ export default Vue.extend({
 		}
 	},
 	computed: {
-		lightmode(): boolean {
-			return this.$store.state.device.lightmode;
-		},
 		cat(): boolean {
 			return this.user.isCat && this.$store.state.settings.circleIcons;
 		},
@@ -55,12 +52,10 @@ export default Vue.extend({
 		},
 		icon(): any {
 			return {
-				backgroundColor: this.lightmode
-					? `rgb(${this.user.avatarColor.slice(0, 3).join(',')})`
-					: this.user.avatarColor && this.user.avatarColor.length == 3
+				backgroundColor: this.user.avatarColor && this.user.avatarColor.length == 3
 						? `rgb(${this.user.avatarColor.join(',')})`
 						: null,
-				backgroundImage: this.lightmode ? null : `url(${this.url})`,
+				backgroundImage: `url(${this.url})`,
 				borderRadius: this.$store.state.settings.circleIcons ? '100%' : null
 			};
 		}

diff --git a/src/client/app/common/views/components/media-image.vue b/src/client/app/common/views/components/media-image.vue
@@ -31,9 +31,6 @@ export default Vue.extend({
 			type: Boolean,
 			required: false,
 			default: true
-		},
-		raw: {
-			default: false
 		}
 	},
 	computed: {
@@ -44,12 +41,6 @@ export default Vue.extend({
 					: this.image.thumbnailUrl
 			})`;
 
-			if (this.$store.state.device.loadRemoteMedia || this.$store.state.device.lightmode) {
-				url = null;
-			} else if (this.raw || this.$store.state.device.loadRawImages) {
-				url = `url(${this.image.url})`;
-			}
-
 			return {
 				'background-color': this.image.properties.avgColor && this.image.properties.avgColor.length == 3 ? `rgb(${this.image.properties.avgColor.join(',')}, 0.3)` : 'transparent',
 				'background-image': url

diff --git a/src/client/app/common/views/components/media-list.vue b/src/client/app/common/views/components/media-list.vue
@@ -7,7 +7,7 @@
 		<div :data-count="mediaList.filter(media => previewable(media)).length" ref="grid">
 			<template v-for="media in mediaList">
 				<mk-media-video :video="media" :key="media.id" v-if="media.type.startsWith('video')"/>
-				<x-image :image="media" :key="media.id" v-else-if="media.type.startsWith('image')" :hide="hide" :raw="raw"/>
+				<x-image :image="media" :key="media.id" v-else-if="media.type.startsWith('image')" :hide="hide"/>
 			</template>
 		</div>
 	</div>

diff --git a/src/client/app/common/views/components/settings/settings.vue b/src/client/app/common/views/components/settings/settings.vue
@@ -42,7 +42,6 @@
 				<ui-switch v-model="suggestRecentHashtags" v-if="isAdvanced">{{ $t('@._settings.suggest-recent-hashtags') }}</ui-switch>
 				<ui-switch v-model="showClockOnHeader" v-if="!$root.isMobile">{{ $t('@._settings.show-clock-on-header') }}</ui-switch>
 				<ui-switch v-model="alwaysShowNsfw">{{ $t('@._settings.always-show-nsfw') }}</ui-switch>
-				<ui-switch v-model="loadRawImages" v-if="isAdvanced">{{ $t('@.load-raw-images') }}</ui-switch>
 				<ui-switch v-model="showReplyTarget">{{ $t('@._settings.show-reply-target') }}</ui-switch>
 				<ui-switch v-model="disableAnimatedMfm">{{ $t('@._settings.disable-animated-mfm') }}</ui-switch>
 				<ui-switch v-model="disableShowingAnimatedImages">{{ $t('@._settings.disable-showing-animated-images') }}</ui-switch>
@@ -421,11 +420,6 @@ export default Vue.extend({
 			set(value) { this.$store.commit('device/set', { key: 'alwaysShowNsfw', value }); }
 		},
 
-		loadRawImages: {
-			get() { return this.$store.state.device.loadRawImages; },
-			set(value) { this.$store.commit('device/set', { key: 'loadRawImages', value }); }
-		},
-
 		postStyle: {
 			get() { return this.$store.state.device.postStyle; },
 			set(value) { this.$store.commit('device/set', { key: 'postStyle', value }); }

diff --git a/src/client/app/desktop/views/components/note-detail.vue b/src/client/app/desktop/views/components/note-detail.vue
@@ -46,7 +46,7 @@
 					<mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis" />
 				</div>
 				<div class="files" v-if="appearNote.files.length > 0">
-					<mk-media-list :media-list="appearNote.files" :hide="!$store.state.device.alwaysShowNsfw && appearNote.cw == null" :raw="true"/>
+					<mk-media-list :media-list="appearNote.files" :hide="!$store.state.device.alwaysShowNsfw && appearNote.cw == null"/>
 				</div>
 				<mk-poll v-if="appearNote.poll" :note="appearNote"/>
 				<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>

diff --git a/src/client/app/mobile/views/components/note-detail.vue b/src/client/app/mobile/views/components/note-detail.vue
@@ -36,7 +36,7 @@
 					<mfm v-if="appearNote.text" :text="appearNote.text" :author="appearNote.user" :i="$store.state.i" :custom-emojis="appearNote.emojis"/>
 				</div>
 				<div class="files" v-if="appearNote.files.length > 0">
-					<mk-media-list :media-list="appearNote.files" :hide="!$store.state.device.alwaysShowNsfw && appearNote.cw == null" :raw="true"/>
+					<mk-media-list :media-list="appearNote.files" :hide="!$store.state.device.alwaysShowNsfw && appearNote.cw == null"/>
 				</div>
 				<mk-poll v-if="appearNote.poll" :note="appearNote"/>
 				<mk-url-preview v-for="url in urls" :url="url" :key="url" :detail="true"/>

diff --git a/src/client/app/store.ts b/src/client/app/store.ts
@@ -62,8 +62,6 @@ const defaultDeviceSettings = Object.assign({
 	lang: null,
 	debug: false,
 	showAdvancedSettings: false,
-	lightmode: false,
-	loadRawImages: false,
 	alwaysShowNsfw: false,
 	postStyle: 'standard',
 	navbar: 'top',