3pp-mirror/neko
1
0
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2025-06-05 04:13:03 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:m1k1o/neko into dev

Browse source
This commit is contained in:
m1k1o 2020-11-02 19:43:24 +01:00
commit 4cd3f715e4
6 changed files with 125 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

31
client/src/components/settings.vue
View file

@ -39,11 +39,7 @@
<span>{{ $t('setting.keyboard_layout') }}</span>
<label class="select">
<select v-model="keyboard_layout">
<option
v-for="(name, code) in keyboard_layouts_list"
:key="code"
:value="code"
>{{ name }}</option>
<option v-for="(name, code) in keyboard_layouts_list" :key="code" :value="code">{{ name }}</option>
</select>
<span />
</label>
@ -211,20 +207,33 @@
.select {
max-width: 120px;
text-align: right;
select:hover {
border: 1px solid $background-secondary;
}
select {
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
display: block;
width: 100%;
max-width: 100%;
padding: 4px;
height: 30px;
text-align: right;
padding: 0 5px 0 10px;
margin: 0;
line-height: 30px;
font-weight: bold;
border: 0;
border-radius: 12px;
color: black;
background-color: $style-primary;
font-size: 12px;
text-overflow: ellipsis;
border: 1px solid transparent;
border-radius: 5px;
color: white;
background-color: $background-tertiary;
font-weight: lighter;
cursor: pointer;
option {
font-weight: normal;

42
client/src/components/video.vue
View file

@ -29,6 +29,12 @@
<ul v-if="!fullscreen" class="video-menu top">
<li><i @click.stop.prevent="requestFullscreen" class="fas fa-expand"></i></li>
<li v-if="admin"><i @click.stop.prevent="onResolution" class="fas fa-desktop"></i></li>
<li class="request-control">
<i
:class="[hosted && !hosting ? 'disabled' : '', !hosted && !hosting ? 'faded' : '', 'fas', 'fa-keyboard']"
@click.stop.prevent="toggleControl"
/>
</li>
</ul>
<ul v-if="!fullscreen" class="video-menu bottom">
<li v-if="hosting && !clipboard_available"><i @click.stop.prevent="onClipboard" class="fas fa-clipboard"></i></li>
@ -75,6 +81,24 @@
text-align: center;
color: rgba($color: #fff, $alpha: 0.6);
cursor: pointer;
&.faded {
color: rgba($color: $text-normal, $alpha: 0.4);
}
&.disabled {
color: rgba($color: $style-error, $alpha: 0.4);
}
}
&.request-control {
display: none;
}
@media (max-width: 768px) {
&.request-control {
display: inline-block;
}
}
&:last-child {
@ -197,6 +221,10 @@
return this.$accessor.remote.hosting
}
get hosted() {
return this.$accessor.remote.hosted
}
get volume() {
return this.$accessor.video.volume
}
@ -350,7 +378,7 @@
this.$accessor.video.setPlayable(false)
})
this._video.addEventListener('error', event => {
this._video.addEventListener('error', (event) => {
this.$log.error(event.error)
this.$accessor.video.setPlayable(false)
})
@ -394,7 +422,7 @@
.then(() => {
this.onResise()
})
.catch(err => this.$log.error)
.catch((err) => this.$log.error)
} catch (err) {
this.$log.error(err)
}
@ -420,6 +448,14 @@
}
}
toggleControl() {
if (!this.playable) {
return
}
this.$accessor.remote.toggle()
}
requestFullscreen() {
this._player.requestFullscreen()
this.onResise()
@ -433,7 +469,7 @@
if (this.hosting && this.clipboard_available && typeof navigator.clipboard.readText === 'function') {
navigator.clipboard
.readText()
.then(text => {
.then((text) => {
if (this.clipboard !== text) {
this.$accessor.remote.setClipboard(text)
this.$accessor.remote.sendClipboard(text)