aboutsummaryrefslogtreecommitdiffhomepage
path: root/client/src/app/shared
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-06-07 22:34:02 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-06-07 22:34:02 +0200
commite822fdaeee90cb7c70d5678f19249198cd7aae8c (patch)
tree07678eff3b3d378bda40800002b515b982017c78 /client/src/app/shared
parent8c255eb53c8f47bd64778d6fbcb93b248ee14163 (diff)
downloadPeerTube-e822fdaeee90cb7c70d5678f19249198cd7aae8c.tar.gz
PeerTube-e822fdaeee90cb7c70d5678f19249198cd7aae8c.tar.zst
PeerTube-e822fdaeee90cb7c70d5678f19249198cd7aae8c.zip
Use ng2-file-upload instead of jquery and add tags support to the video
upload form
Diffstat (limited to 'client/src/app/shared')
-rw-r--r--client/src/app/shared/search/search-field.type.ts2
-rw-r--r--client/src/app/shared/search/search.component.ts3
-rw-r--r--client/src/app/shared/users/auth.service.ts6
3 files changed, 8 insertions, 3 deletions
diff --git a/client/src/app/shared/search/search-field.type.ts b/client/src/app/shared/search/search-field.type.ts
index 846236290..5228ee68a 100644
--- a/client/src/app/shared/search/search-field.type.ts
+++ b/client/src/app/shared/search/search-field.type.ts
@@ -1 +1 @@
export type SearchField = "name" | "author" | "podUrl" | "magnetUri"; export type SearchField = "name" | "author" | "podUrl" | "magnetUri" | "tags";
diff --git a/client/src/app/shared/search/search.component.ts b/client/src/app/shared/search/search.component.ts
index 31f8b1535..c14c2d99c 100644
--- a/client/src/app/shared/search/search.component.ts
+++ b/client/src/app/shared/search/search.component.ts
@@ -18,7 +18,8 @@ export class SearchComponent {
18 name: 'Name', 18 name: 'Name',
19 author: 'Author', 19 author: 'Author',
20 podUrl: 'Pod Url', 20 podUrl: 'Pod Url',
21 magnetUri: 'Magnet Uri' 21 magnetUri: 'Magnet Uri',
22 tags: 'Tags'
22 }; 23 };
23 searchCriterias: Search = { 24 searchCriterias: Search = {
24 field: 'name', 25 field: 'name',
diff --git a/client/src/app/shared/users/auth.service.ts b/client/src/app/shared/users/auth.service.ts
index 720037563..1c822c1e1 100644
--- a/client/src/app/shared/users/auth.service.ts
+++ b/client/src/app/shared/users/auth.service.ts
@@ -43,7 +43,11 @@ export class AuthService {
43 } 43 }
44 44
45 getRequestHeader() { 45 getRequestHeader() {
46 return new Headers({ 'Authorization': `${this.getTokenType()} ${this.getToken()}` }); 46 return new Headers({ 'Authorization': this.getRequestHeaderValue() });
47 }
48
49 getRequestHeaderValue() {
50 return `${this.getTokenType()} ${this.getToken()}`;
47 } 51 }
48 52
49 getToken() { 53 getToken() {