1
0
Fork 0

Update dependencies

This commit is contained in:
Chocobozzz 2018-01-09 16:30:39 +01:00
parent d77014491b
commit 234b535dac
No known key found for this signature in database
GPG key ID: 583A612D890159BE
7 changed files with 355 additions and 264 deletions

View file

@ -36,16 +36,16 @@
"@angular/router": "~5.1.0", "@angular/router": "~5.1.0",
"@angularclass/hmr": "^2.1.3", "@angularclass/hmr": "^2.1.3",
"@ngx-loading-bar/http-client": "^1.0.0-rc.1", "@ngx-loading-bar/http-client": "^1.0.0-rc.1",
"@ngx-meta/core": "^4.0.1", "@ngx-meta/core": "^5.0.0",
"@types/core-js": "^0.9.28", "@types/core-js": "^0.9.28",
"@types/lodash-es": "^4.17.0", "@types/lodash-es": "^4.17.0",
"@types/markdown-it": "^0.0.4", "@types/markdown-it": "^0.0.4",
"@types/node": "^8.0.33", "@types/node": "^9.3.0",
"@types/sanitize-html": "^1.14.0", "@types/sanitize-html": "^1.14.0",
"@types/video.js": "6.2.0", "@types/video.js": "6.2.3",
"@types/webtorrent": "^0.98.4", "@types/webtorrent": "^0.98.4",
"angular2-notifications": "^0.9.6", "angular2-notifications": "^0.9.6",
"awesome-typescript-loader": "3.2.3", "awesome-typescript-loader": "3.4.1",
"bootstrap-sass": "^3.3.7", "bootstrap-sass": "^3.3.7",
"codelyzer": "^4.0.2", "codelyzer": "^4.0.2",
"core-js": "^2.4.1", "core-js": "^2.4.1",
@ -55,10 +55,10 @@
"html-webpack-plugin": "^2.19.0", "html-webpack-plugin": "^2.19.0",
"lodash-es": "^4.17.4", "lodash-es": "^4.17.4",
"markdown-it": "^8.4.0", "markdown-it": "^8.4.0",
"ngx-bootstrap": "2.0.0-beta.9", "ngx-bootstrap": "2.0.0-rc.0",
"ngx-chips": "1.6.1", "ngx-chips": "1.6.2",
"ngx-clipboard": "^9.0.0", "ngx-clipboard": "^9.0.0",
"ngx-infinite-scroll": "^0.7.0", "ngx-infinite-scroll": "0.7.2",
"ngx-pipes": "^2.0.5", "ngx-pipes": "^2.0.5",
"node-sass": "^4.1.1", "node-sass": "^4.1.1",
"npm-font-source-sans-pro": "^1.0.2", "npm-font-source-sans-pro": "^1.0.2",

View file

@ -14,7 +14,7 @@
<div class="file-max-size">(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})</div> <div class="file-max-size">(extensions: {{ avatarExtensions }}, max size: {{ maxAvatarSize | bytes }})</div>
<div class="user-quota"> <div class="user-quota">
<span class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ user.videoQuota | bytes: 0 }} <span class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }}
</div> </div>
<div class="account-title">Account settings</div> <div class="account-title">Account settings</div>

View file

@ -1,5 +1,6 @@
import { Component, OnInit, ViewChild } from '@angular/core' import { Component, OnInit, ViewChild } from '@angular/core'
import { NotificationsService } from 'angular2-notifications' import { NotificationsService } from 'angular2-notifications'
import { BytesPipe } from 'ngx-pipes'
import { AuthService } from '../../core' import { AuthService } from '../../core'
import { ServerService } from '../../core/server' import { ServerService } from '../../core/server'
import { User } from '../../shared' import { User } from '../../shared'
@ -14,6 +15,7 @@ export class AccountSettingsComponent implements OnInit {
@ViewChild('avatarfileInput') avatarfileInput @ViewChild('avatarfileInput') avatarfileInput
user: User = null user: User = null
userVideoQuota = '0'
userVideoQuotaUsed = 0 userVideoQuotaUsed = 0
constructor ( constructor (
@ -26,6 +28,16 @@ export class AccountSettingsComponent implements OnInit {
ngOnInit () { ngOnInit () {
this.user = this.authService.getUser() this.user = this.authService.getUser()
this.authService.userInformationLoaded.subscribe(
() => {
if (this.user.videoQuota !== -1) {
this.userVideoQuota = new BytesPipe().transform(this.user.videoQuota, 0).toString()
} else {
this.userVideoQuota = 'Unlimited'
}
}
)
this.userService.getMyVideoQuotaUsed() this.userService.getMyVideoQuotaUsed()
.subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed) .subscribe(data => this.userVideoQuotaUsed = data.videoQuotaUsed)
} }

View file

@ -19,6 +19,11 @@ export class AccountVideosComponent extends AbstractVideoList implements OnInit
titlePage = 'My videos' titlePage = 'My videos'
currentRoute = '/account/videos' currentRoute = '/account/videos'
checkedVideos: { [ id: number ]: boolean } = {} checkedVideos: { [ id: number ]: boolean } = {}
pagination = {
currentPage: 1,
itemsPerPage: 10,
totalItems: null
}
constructor (protected router: Router, constructor (protected router: Router,
protected route: ActivatedRoute, protected route: ActivatedRoute,

View file

@ -329,7 +329,9 @@ export class VideoWatchComponent implements OnInit, OnDestroy {
playerElement: this.playerElement, playerElement: this.playerElement,
peerTubeLink: false peerTubeLink: false
}, },
hotkeys: {} hotkeys: {
enableVolumeScroll: false
}
} }
} }

View file

@ -43,7 +43,9 @@ loadVideoInfo(videoId, (err, videoInfo) => {
playerElement: videoElement, playerElement: videoElement,
peerTubeLink: true peerTubeLink: true
}, },
hotkeys: {} hotkeys: {
enableVolumeScroll: false
}
} }
} }
videojs('video-container', videojsOptions, function () { videojs('video-container', videojsOptions, function () {

File diff suppressed because it is too large Load diff