diff options
author | Chocobozzz <florian.bigard@gmail.com> | 2017-04-12 22:00:17 +0200 |
---|---|---|
committer | Chocobozzz <florian.bigard@gmail.com> | 2017-04-12 22:00:17 +0200 |
commit | ad42bea3a55ca7937f082cc641764de70ce34bd1 (patch) | |
tree | 621302fd9fa39ad5e76c5c0a5e7197464a0ea125 /client/src/app/shared | |
parent | d8e689b864749648d03cf4391fd4a475126f01cd (diff) | |
download | PeerTube-ad42bea3a55ca7937f082cc641764de70ce34bd1.tar.gz PeerTube-ad42bea3a55ca7937f082cc641764de70ce34bd1.tar.zst PeerTube-ad42bea3a55ca7937f082cc641764de70ce34bd1.zip |
Client: update to angular 4
Diffstat (limited to 'client/src/app/shared')
-rw-r--r-- | client/src/app/shared/search/search.component.html | 2 | ||||
-rw-r--r-- | client/src/app/shared/shared.module.ts | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/client/src/app/shared/search/search.component.html b/client/src/app/shared/search/search.component.html index b3afc9598..0c7b5038a 100644 --- a/client/src/app/shared/search/search.component.html +++ b/client/src/app/shared/search/search.component.html | |||
@@ -3,7 +3,7 @@ | |||
3 | <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdownToggle> | 3 | <button id="simple-btn-keyboard-nav" type="button" class="btn btn-default" dropdownToggle> |
4 | {{ getStringChoice(searchCriterias.field) }} <span class="caret"></span> | 4 | {{ getStringChoice(searchCriterias.field) }} <span class="caret"></span> |
5 | </button> | 5 | </button> |
6 | <ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav" dropdownMenu> | 6 | <ul class="dropdown-menu" role="menu" aria-labelledby="simple-btn-keyboard-nav" *dropdownMenu> |
7 | <li *ngFor="let choice of choiceKeys" class="dropdown-item" role="menu-item"> | 7 | <li *ngFor="let choice of choiceKeys" class="dropdown-item" role="menu-item"> |
8 | <a class="dropdown-item" href="#" (click)="choose($event, choice)">{{ getStringChoice(choice) }}</a> | 8 | <a class="dropdown-item" href="#" (click)="choose($event, choice)">{{ getStringChoice(choice) }}</a> |
9 | </li> | 9 | </li> |
diff --git a/client/src/app/shared/shared.module.ts b/client/src/app/shared/shared.module.ts index 84cc86c64..8ffaf964b 100644 --- a/client/src/app/shared/shared.module.ts +++ b/client/src/app/shared/shared.module.ts | |||
@@ -6,10 +6,10 @@ import { RouterModule } from '@angular/router'; | |||
6 | 6 | ||
7 | import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; | 7 | import { BytesPipe } from 'angular-pipes/src/math/bytes.pipe'; |
8 | import { KeysPipe } from 'angular-pipes/src/object/keys.pipe'; | 8 | import { KeysPipe } from 'angular-pipes/src/object/keys.pipe'; |
9 | import { DropdownModule } from 'ng2-bootstrap/dropdown'; | 9 | import { BsDropdownModule } from 'ngx-bootstrap/dropdown'; |
10 | import { ProgressbarModule } from 'ng2-bootstrap/progressbar'; | 10 | import { ProgressbarModule } from 'ngx-bootstrap/progressbar'; |
11 | import { PaginationModule } from 'ng2-bootstrap/pagination'; | 11 | import { PaginationModule } from 'ngx-bootstrap/pagination'; |
12 | import { ModalModule } from 'ng2-bootstrap/modal'; | 12 | import { ModalModule } from 'ngx-bootstrap/modal'; |
13 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; | 13 | import { FileUploadModule } from 'ng2-file-upload/ng2-file-upload'; |
14 | import { Ng2SmartTableModule } from 'ng2-smart-table'; | 14 | import { Ng2SmartTableModule } from 'ng2-smart-table'; |
15 | 15 | ||
@@ -27,7 +27,7 @@ import { VideoAbuseService } from './video-abuse'; | |||
27 | HttpModule, | 27 | HttpModule, |
28 | RouterModule, | 28 | RouterModule, |
29 | 29 | ||
30 | DropdownModule.forRoot(), | 30 | BsDropdownModule.forRoot(), |
31 | ModalModule.forRoot(), | 31 | ModalModule.forRoot(), |
32 | PaginationModule.forRoot(), | 32 | PaginationModule.forRoot(), |
33 | ProgressbarModule.forRoot(), | 33 | ProgressbarModule.forRoot(), |
@@ -49,7 +49,7 @@ import { VideoAbuseService } from './video-abuse'; | |||
49 | HttpModule, | 49 | HttpModule, |
50 | RouterModule, | 50 | RouterModule, |
51 | 51 | ||
52 | DropdownModule, | 52 | BsDropdownModule, |
53 | FileUploadModule, | 53 | FileUploadModule, |
54 | ModalModule, | 54 | ModalModule, |
55 | PaginationModule, | 55 | PaginationModule, |