OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix video action dropdown

pull/1935/head
Chocobozzz 2019-06-07 11:08:56 +02:00
parent 3ddb1ec555
commit f238aec54f
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/app/shared/buttons/action-dropdown.component.ts
View File

@ -41,10 +41,4 @@ export class ActionDropdownComponent<T> {
areActionsDisplayed (actions: DropdownAction<T>[], entry: T) {
return actions.some(a => a.isDisplayed === undefined || a.isDisplayed(entry))
}
handleClick (event: Event, action: DropdownAction<T>) {
event.preventDefault()
// action.handler(entry)
}
}

32
client/src/app/shared/video/video-actions-dropdown.component.ts
View File

@ -188,19 +188,16 @@ export class VideoActionsDropdownComponent implements OnChanges {
}
private buildActions () {
this.videoActions = []
if (this.authService.isLoggedIn()) {
this.videoActions.push([
this.videoActions = [
[
{
label: this.i18n('Save to playlist'),
handler: () => this.playlistDropdown.toggle(),
isDisplayed: () => this.displayOptions.playlist,
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.playlist,
iconName: 'playlist-add'
}
])
this.videoActions.push([
],
[
{
label: this.i18n('Download'),
handler: () => this.showDownloadModal(),
@ -211,36 +208,35 @@ export class VideoActionsDropdownComponent implements OnChanges {
label: this.i18n('Update'),
linkBuilder: ({ video }) => [ '/videos/update', video.uuid ],
iconName: 'edit',
isDisplayed: () => this.displayOptions.update && this.isVideoUpdatable()
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.update && this.isVideoUpdatable()
},
{
label: this.i18n('Blacklist'),
handler: () => this.showBlacklistModal(),
iconName: 'no',
isDisplayed: () => this.displayOptions.blacklist && this.isVideoBlacklistable()
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoBlacklistable()
},
{
label: this.i18n('Unblacklist'),
handler: () => this.unblacklistVideo(),
iconName: 'undo',
isDisplayed: () => this.displayOptions.blacklist && this.isVideoUnblacklistable()
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.blacklist && this.isVideoUnblacklistable()
},
{
label: this.i18n('Delete'),
handler: () => this.removeVideo(),
isDisplayed: () => this.displayOptions.delete && this.isVideoRemovable(),
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.delete && this.isVideoRemovable(),
iconName: 'delete'
}
])
this.videoActions.push([
],
[
{
label: this.i18n('Report'),
handler: () => this.showReportModal(),
isDisplayed: () => this.displayOptions.report,
isDisplayed: () => this.authService.isLoggedIn() && this.displayOptions.report,
iconName: 'alert'
}
])
}
]
]
}
}