diff options
author | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-02-11 11:52:34 +0100 |
commit | 88108880bbdba473cfe36ecbebc1c3c4f972e102 (patch) | |
tree | b242efb3b4f0d7e49d88f2d1f2063b5b3b0489c0 /client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts | |
parent | 53a94c7cfa8368da4cd248d65df8346905938f0c (diff) | |
parent | 9b712a2017e4ab3cf12cd6bd58278905520159d0 (diff) | |
download | PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.gz PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.tar.zst PeerTube-88108880bbdba473cfe36ecbebc1c3c4f972e102.zip |
Merge branch 'develop' into pr/1217
Diffstat (limited to 'client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts')
-rw-r--r-- | client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts index fbc85c74f..d11685916 100644 --- a/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts +++ b/client/src/app/videos/+video-edit/video-add-components/video-import-url.component.ts | |||
@@ -1,8 +1,7 @@ | |||
1 | import { Component, EventEmitter, OnInit, Output } from '@angular/core' | 1 | import { Component, EventEmitter, OnInit, Output } from '@angular/core' |
2 | import { Router } from '@angular/router' | 2 | import { Router } from '@angular/router' |
3 | import { NotificationsService } from 'angular2-notifications' | ||
4 | import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos' | 3 | import { VideoPrivacy, VideoUpdate } from '../../../../../../shared/models/videos' |
5 | import { AuthService, ServerService } from '../../../core' | 4 | import { AuthService, Notifier, ServerService } from '../../../core' |
6 | import { VideoService } from '../../../shared/video/video.service' | 5 | import { VideoService } from '../../../shared/video/video.service' |
7 | import { I18n } from '@ngx-translate/i18n-polyfill' | 6 | import { I18n } from '@ngx-translate/i18n-polyfill' |
8 | import { LoadingBarService } from '@ngx-loading-bar/core' | 7 | import { LoadingBarService } from '@ngx-loading-bar/core' |
@@ -12,33 +11,35 @@ import { VideoEdit } from '@app/shared/video/video-edit.model' | |||
12 | import { FormValidatorService } from '@app/shared' | 11 | import { FormValidatorService } from '@app/shared' |
13 | import { VideoCaptionService } from '@app/shared/video-caption' | 12 | import { VideoCaptionService } from '@app/shared/video-caption' |
14 | import { VideoImportService } from '@app/shared/video-import' | 13 | import { VideoImportService } from '@app/shared/video-import' |
14 | import { scrollToTop } from '@app/shared/misc/utils' | ||
15 | 15 | ||
16 | @Component({ | 16 | @Component({ |
17 | selector: 'my-video-import-url', | 17 | selector: 'my-video-import-url', |
18 | templateUrl: './video-import-url.component.html', | 18 | templateUrl: './video-import-url.component.html', |
19 | styleUrls: [ | 19 | styleUrls: [ |
20 | '../shared/video-edit.component.scss', | 20 | '../shared/video-edit.component.scss', |
21 | './video-import-url.component.scss' | 21 | './video-send.scss' |
22 | ] | 22 | ] |
23 | }) | 23 | }) |
24 | export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { | 24 | export class VideoImportUrlComponent extends VideoSend implements OnInit, CanComponentDeactivate { |
25 | @Output() firstStepDone = new EventEmitter<string>() | 25 | @Output() firstStepDone = new EventEmitter<string>() |
26 | @Output() firstStepError = new EventEmitter<void>() | ||
26 | 27 | ||
27 | targetUrl = '' | 28 | targetUrl = '' |
28 | videoFileName: string | ||
29 | 29 | ||
30 | isImportingVideo = false | 30 | isImportingVideo = false |
31 | hasImportedVideo = false | 31 | hasImportedVideo = false |
32 | isUpdatingVideo = false | 32 | isUpdatingVideo = false |
33 | 33 | ||
34 | video: VideoEdit | 34 | video: VideoEdit |
35 | error: string | ||
35 | 36 | ||
36 | protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC | 37 | protected readonly DEFAULT_VIDEO_PRIVACY = VideoPrivacy.PUBLIC |
37 | 38 | ||
38 | constructor ( | 39 | constructor ( |
39 | protected formValidatorService: FormValidatorService, | 40 | protected formValidatorService: FormValidatorService, |
40 | protected loadingBar: LoadingBarService, | 41 | protected loadingBar: LoadingBarService, |
41 | protected notificationsService: NotificationsService, | 42 | protected notifier: Notifier, |
42 | protected authService: AuthService, | 43 | protected authService: AuthService, |
43 | protected serverService: ServerService, | 44 | protected serverService: ServerService, |
44 | protected videoService: VideoService, | 45 | protected videoService: VideoService, |
@@ -98,7 +99,8 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom | |||
98 | err => { | 99 | err => { |
99 | this.loadingBar.complete() | 100 | this.loadingBar.complete() |
100 | this.isImportingVideo = false | 101 | this.isImportingVideo = false |
101 | this.notificationsService.error(this.i18n('Error'), err.message) | 102 | this.firstStepError.emit() |
103 | this.notifier.error(err.message) | ||
102 | } | 104 | } |
103 | ) | 105 | ) |
104 | } | 106 | } |
@@ -117,14 +119,14 @@ export class VideoImportUrlComponent extends VideoSend implements OnInit, CanCom | |||
117 | .subscribe( | 119 | .subscribe( |
118 | () => { | 120 | () => { |
119 | this.isUpdatingVideo = false | 121 | this.isUpdatingVideo = false |
120 | this.notificationsService.success(this.i18n('Success'), this.i18n('Video to import updated.')) | 122 | this.notifier.success(this.i18n('Video to import updated.')) |
121 | 123 | ||
122 | this.router.navigate([ '/my-account', 'video-imports' ]) | 124 | this.router.navigate([ '/my-account', 'video-imports' ]) |
123 | }, | 125 | }, |
124 | 126 | ||
125 | err => { | 127 | err => { |
126 | this.isUpdatingVideo = false | 128 | this.error = err.message |
127 | this.notificationsService.error(this.i18n('Error'), err.message) | 129 | scrollToTop() |
128 | console.error(err) | 130 | console.error(err) |
129 | } | 131 | } |
130 | ) | 132 | ) |