Skip to content
Next
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Switch to GitLab Next
Sign in / Register
Toggle navigation
Minds Frontend
Project
Project
Details
Activity
Releases
Cycle Analytics
Insights
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
864
Issues
864
List
Boards
Labels
Service Desk
Milestones
Merge Requests
46
Merge Requests
46
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Security & Compliance
Security & Compliance
Dependency List
Packages
Packages
List
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
ad896477
Commit
ad896477
authored
4 hours ago
by
Mark Harding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(fix): annoying video issues, open modal even if not preloaded metadata, disable webtorrent
parent
4de44409
master
No related merge requests found
Pipeline
#86113535
waiting for manual action with stages
in 54 minutes and 1 second
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
8 deletions
+12
-8
src/app/modules/media/components/video/video.component.html
src/app/modules/media/components/video/video.component.html
+3
-3
src/app/modules/media/components/video/video.component.ts
src/app/modules/media/components/video/video.component.ts
+3
-3
src/app/modules/media/modal/modal.component.ts
src/app/modules/media/modal/modal.component.ts
+6
-2
No files found.
src/app/modules/media/components/video/video.component.html
View file @
ad896477
<ng-container
*ngIf=
"current"
>
<m-video--direct-http-player
*ngIf=
"current.type === 'direct-http'"
*ngIf=
"current.type === 'direct-http'
|| true
"
class=
"m-video--player"
[src]=
"current.src"
[poster]=
"poster"
...
...
@@ -18,7 +18,7 @@
></m-video--direct-http-player>
<m-video--torrent-player
*ngIf=
"current.type === 'torrent'"
*ngIf=
"current.type === 'torrent'
&& false
"
class=
"m-video--player"
[src]=
"current.src"
[poster]=
"poster"
...
...
@@ -39,7 +39,7 @@
<i
*ngIf=
"
(!playerRef.isPlaying() && !playerRef.isLoading()) ||
(
isActivity && metadataLoaded
&& !playerRef.isPlaying())
(
shouldPlayInModal
&& !playerRef.isPlaying())
"
class=
"material-icons minds-video-play-icon"
(click)=
"clickedVideo()"
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/media/components/video/video.component.ts
View file @
ad896477
...
...
@@ -435,9 +435,9 @@ export class MindsVideoComponent implements OnDestroy {
}
clickedVideo
()
{
if
(
!
this
.
metadataLoaded
)
{
return
;
}
//
if (!this.metadataLoaded) {
//
return;
//
}
const
isNotTablet
=
Math
.
min
(
screen
.
width
,
screen
.
height
)
<
768
;
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/media/modal/modal.component.ts
View file @
ad896477
...
...
@@ -151,8 +151,12 @@ export class MediaModalComponent implements OnInit, OnDestroy {
switch
(
this
.
entity
.
custom_type
)
{
case
'
video
'
:
this
.
contentType
=
'
video
'
;
this
.
entity
.
width
=
this
.
entity
.
custom_data
.
dimensions
.
width
;
this
.
entity
.
height
=
this
.
entity
.
custom_data
.
dimensions
.
height
;
this
.
entity
.
width
=
this
.
entity
.
custom_data
.
dimensions
?
this
.
entity
.
custom_data
.
dimensions
.
width
:
1280
;
this
.
entity
.
height
=
this
.
entity
.
custom_data
.
dimensions
?
this
.
entity
.
custom_data
.
dimensions
.
height
:
720
;
this
.
entity
.
thumbnail_src
=
this
.
entity
.
custom_data
.
thumbnail_src
;
break
;
case
'
batch
'
:
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment