Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/spreed.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarco Ambrosini <marcoambrosini@pm.me>2020-05-14 16:23:41 +0300
committerJoas Schilling <coding@schilljs.com>2020-05-18 12:57:23 +0300
commita4ad1b68c5c06d1d0df51798deb6c6a035468f56 (patch)
tree5f185141b6350d5df627d500e189fa4d10966af8
parenteb02b92f56f7d901d7ed4f225d63f58675bd8e0a (diff)
Remove unused prop
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
-rw-r--r--src/FilesSidebarCallViewApp.vue3
-rw-r--r--src/PublicShareSidebar.vue3
-rw-r--r--src/components/CallView/CallView.vue33
-rw-r--r--src/components/CallView/GridView/GridView.vue2
-rw-r--r--src/components/CallView/shared/Video.vue11
5 files changed, 3 insertions, 49 deletions
diff --git a/src/FilesSidebarCallViewApp.vue b/src/FilesSidebarCallViewApp.vue
index 790455beb..c8a5931f5 100644
--- a/src/FilesSidebarCallViewApp.vue
+++ b/src/FilesSidebarCallViewApp.vue
@@ -25,8 +25,7 @@
<CallView
v-show="isInCall"
:token="token"
- :is-sidebar="true"
- :use-constrained-layout="true" />
+ :is-sidebar="true" />
<PreventUnload :when="isInCall" />
</div>
</template>
diff --git a/src/PublicShareSidebar.vue b/src/PublicShareSidebar.vue
index 36fa6d124..a84388818 100644
--- a/src/PublicShareSidebar.vue
+++ b/src/PublicShareSidebar.vue
@@ -34,8 +34,7 @@
<template v-else>
<CallView v-if="isInCall"
:token="token"
- :is-sidebar="true"
- :use-constrained-layout="true" />
+ :is-sidebar="true" />
<PreventUnload :when="isInCall" />
<CallButton class="call-button" />
<ChatView :token="token" />
diff --git a/src/components/CallView/CallView.vue b/src/components/CallView/CallView.vue
index 842483944..2ab40cfc8 100644
--- a/src/components/CallView/CallView.vue
+++ b/src/components/CallView/CallView.vue
@@ -80,7 +80,6 @@
:local-media-model="localMediaModel"
:video-container-aspect-ratio="videoContainerAspectRatio"
:local-call-participant-model="localCallParticipantModel"
- :use-constrained-layout="false"
:is-sidebar="isSidebar"
@switchScreenToId="1" />
<div v-if="!isSidebar" id="screens">
@@ -172,7 +171,6 @@ export default {
const callViewClass = {
'incall': this.remoteParticipantsCount > 0,
'screensharing': this.screenSharingActive,
- 'constrained-layout': this.useConstrainedLayout,
}
callViewClass['participants-' + (this.remoteParticipantsCount + 1)] = true
@@ -493,12 +491,6 @@ export default {
}
}
-.constrained-layout #videos .videoContainer:not(.promoted) ::v-deep video {
- /* Make the unpromoted videos smaller to not overlap too much the promoted
- * video */
- max-height: 100px;
-}
-
#videos .videoContainer ::v-deep .avatardiv {
box-shadow: 0 0 15px var(--color-box-shadow);
}
@@ -537,13 +529,6 @@ export default {
}
}
-.constrained-layout.participants-1 .videoView,
-.constrained-layout.participants-2 .videoView {
- /* Do not force the width to 200px, as otherwise the video is too tall and
- * overlaps too much with the promoted video. */
- min-width: initial;
-}
-
.participants-1 .videoView ::v-deep video,
.participants-2 .videoView ::v-deep video {
position: absolute;
@@ -561,12 +546,6 @@ export default {
background-color: transparent;
}
-.constrained-layout.screensharing #screens {
- /* The row with the participants is shorter in the constrained layout to
- * make room for the promoted video and the shared screens. */
- height: calc(100% - 100px);
-}
-
.screensharing .screenContainer {
position: relative;
width: 100%;
@@ -589,13 +568,6 @@ export default {
text-overflow: ellipsis;
}
-.constrained-layout ::v-deep .nameIndicator {
- /* Reduce padding to bring the name closer to the bottom */
- padding: 3px;
- /* Use default font size, as it takes too much space otherwise */
- font-size: initial;
-}
-
::v-deep .videoView .nameIndicator {
padding: 0;
overflow: visible;
@@ -618,11 +590,6 @@ export default {
padding: 12px 35%;
}
-.constrained-layout.participants-2 ::v-deep .videoContainer.promoted + .videoContainer-dummy .nameIndicator {
- /* Reduce padding to bring the name closer to the bottom */
- padding: 3px 35%;
-}
-
#videos .videoContainer.speaking:not(.videoView) ::v-deep .nameIndicator,
#videos .videoContainer.videoView.speaking ::v-deep .nameIndicator .icon-audio {
animation: pulse 1s;
diff --git a/src/components/CallView/GridView/GridView.vue b/src/components/CallView/GridView/GridView.vue
index d7518c34b..3b3679d57 100644
--- a/src/components/CallView/GridView/GridView.vue
+++ b/src/components/CallView/GridView/GridView.vue
@@ -61,7 +61,6 @@
:local-media-model="localMediaModel"
:video-container-aspect-ratio="videoContainerAspectRatio"
:local-call-participant-model="localCallParticipantModel"
- :use-constrained-layout="false"
@switchScreenToId="1" />
</template>
<!-- Grid developer mode -->
@@ -91,7 +90,6 @@
:local-media-model="localMediaModel"
:video-container-aspect-ratio="videoContainerAspectRatio"
:local-call-participant-model="localCallParticipantModel"
- :use-constrained-layout="false"
@switchScreenToId="1" />
<!-- page indicator (disabled) -->
<div
diff --git a/src/components/CallView/shared/Video.vue b/src/components/CallView/shared/Video.vue
index 4d0f3bad2..8f807cdbf 100644
--- a/src/components/CallView/shared/Video.vue
+++ b/src/components/CallView/shared/Video.vue
@@ -145,10 +145,6 @@ export default {
type: Object,
required: true,
},
- useConstrainedLayout: {
- type: Boolean,
- default: false,
- },
showVideoOverlay: {
type: Boolean,
default: true,
@@ -229,7 +225,7 @@ export default {
},
avatarSize() {
- return (this.useConstrainedLayout && !this.sharedData.promoted) ? 64 : 128
+ return !this.sharedData.promoted ? 64 : 128
},
avatarClass() {
@@ -465,11 +461,6 @@ export default {
}
}
-.constrained-layout .mediaIndicator {
- /* Move the media indicator closer to the bottom */
- bottom: 16px;
-}
-
.muteIndicator,
.hideRemoteVideo,
.screensharingIndicator,