Revert "Merge remote-tracking branch 'thatonecalculator/vlite' into develop"

This reverts commit d146280677, reversing
changes made to 9fc5062018.
This commit is contained in:
ThatOneCalculator 2022-07-18 22:56:28 -07:00
parent 563999f09d
commit c7c3d6e0dd
3 changed files with 14 additions and 38 deletions

View file

@ -72,7 +72,6 @@
"v-debounce": "0.1.2", "v-debounce": "0.1.2",
"vanilla-tilt": "1.7.2", "vanilla-tilt": "1.7.2",
"vite": "^3.0.2", "vite": "^3.0.2",
"vlitejs": "4.0.6",
"vue": "3.2.37", "vue": "3.2.37",
"vue-prism-editor": "2.0.0-alpha.2", "vue-prism-editor": "2.0.0-alpha.2",
"vuedraggable": "4.0.1", "vuedraggable": "4.0.1",

View file

@ -6,9 +6,8 @@
<span>{{ $ts.clickToShow }}</span> <span>{{ $ts.clickToShow }}</span>
</div> </div>
<div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio"> <div v-else-if="media.type.startsWith('audio') && media.type !== 'audio/midi'" class="audio">
<audio <audio ref="audioEl"
ref="audioEl" class="audio"
class="audio vlite-js"
:src="media.url" :src="media.url"
:title="media.name" :title="media.name"
controls controls
@ -29,8 +28,6 @@
<script lang="ts" setup> <script lang="ts" setup>
import { onMounted } from 'vue'; import { onMounted } from 'vue';
import * as misskey from 'misskey-js'; import * as misskey from 'misskey-js';
import 'vlitejs/dist/vlite.css';
import Vlitejs from 'vlitejs';
import { ColdDeviceStorage } from '@/store'; import { ColdDeviceStorage } from '@/store';
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
@ -46,10 +43,7 @@ function volumechange() {
} }
onMounted(() => { onMounted(() => {
if (audioEl) { if (audioEl) audioEl.volume = ColdDeviceStorage.get('mediaVolume');
audioEl.volume = ColdDeviceStorage.get('mediaVolume');
new Vlitejs(audioEl);
}
}); });
</script> </script>
@ -60,11 +54,6 @@ onMounted(() => {
margin-top: 4px; margin-top: 4px;
overflow: hidden; overflow: hidden;
> .vlite-js {
--vlite-colorPrimary: var(--accent);
--vlite-controlsColor: var(--fg);
}
> .download, > .download,
> .sensitive { > .sensitive {
display: flex; display: flex;
@ -95,10 +84,10 @@ onMounted(() => {
background: var(--noteAttachedFile); background: var(--noteAttachedFile);
} }
/* > .sensitive { > .sensitive {
background: #111; background: #111;
color: #fff; color: #fff;
} */ }
> .audio { > .audio {
.audio { .audio {

View file

@ -7,38 +7,31 @@
</div> </div>
<div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu"> <div v-else class="kkjnbbplepmiyuadieoenjgutgcmtsvu">
<video <video
ref="videoEl"
:poster="video.thumbnailUrl" :poster="video.thumbnailUrl"
:title="video.comment" :title="video.comment"
:alt="video.comment" :alt="video.comment"
class="vlite-js"
preload="none" preload="none"
controls controls
@contextmenu.stop
>
<source
:src="video.url" :src="video.url"
:type="video.type" :type="video.type"
@contextmenu.stop >
></video> </video>
<i class="fas fa-eye-slash" @click="hide = true"></i> <i class="fas fa-eye-slash" @click="hide = true"></i>
</div> </div>
</template> </template>
<script lang="ts" setup> <script lang="ts" setup>
import { ref, onMounted } from 'vue'; import { ref } from 'vue';
import * as misskey from 'misskey-js'; import * as misskey from 'misskey-js';
import 'vlitejs/dist/vlite.css';
import Vlitejs from 'vlitejs';
import { defaultStore } from '@/store'; import { defaultStore } from '@/store';
const props = defineProps<{ const props = defineProps<{
video: misskey.entities.DriveFile; video: misskey.entities.DriveFile;
}>(); }>();
const videoEl = $ref(null);
onMounted(() => {
new Vlitejs(videoEl);
});
const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSensitive && (defaultStore.state.nsfw !== 'ignore')); const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSensitive && (defaultStore.state.nsfw !== 'ignore'));
</script> </script>
@ -46,11 +39,6 @@ const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSe
.kkjnbbplepmiyuadieoenjgutgcmtsvu { .kkjnbbplepmiyuadieoenjgutgcmtsvu {
position: relative; position: relative;
> .vlite-js {
--vlite-colorPrimary: var(--accent);
--vlite-controlsColor: var(--fg);
}
> i { > i {
display: block; display: block;
position: absolute; position: absolute;
@ -84,8 +72,8 @@ const hide = ref((defaultStore.state.nsfw === 'force') ? true : props.video.isSe
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
/* background: #111; background: #111;
color: #fff; */ color: #fff;
> div { > div {
display: table-cell; display: table-cell;