Skip to content
GitLab
Menu
Why GitLab
Pricing
Contact Sales
Explore
Why GitLab
Pricing
Contact Sales
Explore
Sign in
Get free trial
Commits on Source (2)
fixes hard coded frontend asset links
· e28f75cb
Mark Harding
authored
Sep 16, 2019
e28f75cb
Merge branch 'feat-permissioned-cdn' into 'master'
· 5018532b
Mark Harding
authored
Sep 16, 2019
fixes hard coded frontend asset links See merge request
!551
5018532b
Hide whitespace changes
Inline
Side-by-side
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
;
}
...
...
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
()
{
...
...