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
836
Issues
836
List
Boards
Labels
Service Desk
Milestones
Merge Requests
42
Merge Requests
42
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
Compare Revisions
d202f657b06b473f8101f36122e7554a3c4e2c42...5018532bfa84001f6aaf4c287e736283402af2d0
Source
5018532bfa84001f6aaf4c287e736283402af2d0
Select Git revision
...
Target
d202f657b06b473f8101f36122e7554a3c4e2c42
Select Git revision
Compare
Commits (2)
fixes hard coded frontend asset links
· e28f75cb
Mark Harding
authored
19 minutes ago
e28f75cb
Merge branch 'feat-permissioned-cdn' into 'master'
· 5018532b
Mark Harding
authored
19 minutes ago
fixes hard coded frontend asset links See merge request
!551
5018532b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
10 deletions
+13
-10
modal.component.ts
src/app/modules/media/modal/modal.component.ts
+5
-3
theatre.component.ts
src/app/modules/media/view/views/theatre.component.ts
+8
-7
No files found.
src/app/modules/media/modal/modal.component.ts
View file @
5018532b
...
...
@@ -124,7 +124,7 @@ export class MediaModalComponent implements OnInit, OnDestroy {
this
.
entity
.
title
||
`
${
this
.
entity
.
ownerObj
.
name
}
's post`
;
this
.
entity
.
guid
=
this
.
entity
.
entity_guid
||
this
.
entity
.
guid
;
this
.
thumbnail
=
`
${
this
.
minds
.
cdn_url
}
fs/v1/thumbnail/
${
this
.
entity
.
entity_guid
}
/xlarge`
;
this
.
thumbnail
=
this
.
entity
.
thumbnails
.
xlarge
;
switch
(
this
.
entity
.
custom_type
)
{
case
'
video
'
:
this
.
contentType
=
'
video
'
;
...
...
@@ -141,7 +141,8 @@ export class MediaModalComponent implements OnInit, OnDestroy {
break
;
case
'
image
'
:
this
.
contentType
=
'
image
'
;
this
.
thumbnail
=
`
${
this
.
minds
.
cdn_url
}
fs/v1/thumbnail/
${
this
.
entity
.
guid
}
/xlarge`
;
// this.thumbnail = `${this.minds.cdn_url}fs/v1/thumbnail/${this.entity.guid}/xlarge`;
this
.
thumbnail
=
this
.
entity
.
thumbnail
;
break
;
case
'
blog
'
:
this
.
contentType
=
'
blog
'
;
...
...
@@ -160,7 +161,8 @@ export class MediaModalComponent implements OnInit, OnDestroy {
`
${
this
.
entity
.
ownerObj
.
name
}
's post`
;
this
.
entity
.
guid
=
this
.
entity
.
attachment_guid
;
this
.
entity
.
entity_guid
=
this
.
entity
.
attachment_guid
;
this
.
thumbnail
=
`
${
this
.
minds
.
cdn_url
}
fs/v1/thumbnail/
${
this
.
entity
.
attachment_guid
}
/xlarge`
;
// this.thumbnail = `${this.minds.cdn_url}fs/v1/thumbnail/${this.entity.attachment_guid}/xlarge`;
this
.
thumbnail
=
this
.
entity
.
thumbnails
.
xlarge
;
break
;
}
...
...
This diff is collapsed.
Click to expand it.
src/app/modules/media/view/views/theatre.component.ts
View file @
5018532b
...
...
@@ -90,13 +90,14 @@ export class MediaTheatreComponent {
}
getThumbnail
()
{
const
url
=
this
.
object
.
paywalled
||
(
this
.
object
.
wire_threshold
&&
this
.
object
.
wire_threshold
!==
'
0
'
)
?
this
.
minds
.
site_url
:
this
.
minds
.
cdn_url
;
return
url
+
`fs/v1/thumbnail/
${
this
.
object
.
guid
}
/xlarge`
;
// const url =
// this.object.paywalled ||
// (this.object.wire_threshold && this.object.wire_threshold !== '0')
// ? this.minds.site_url
// : this.minds.cdn_url;
// return url + `fs/v1/thumbnail/${this.object.guid}/xlarge`;
return
this
.
object
.
thumbnail_src
;
}
prev
()
{
...
...
This diff is collapsed.
Click to expand it.