X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fmisc%2Futils.ts;h=8381745f5fd4ad8394ea49949e64b269ab9d42d9;hb=0f7fedc39857ebc0eb29182c1588a92b9adfb75a;hp=b9aa223cf67d34d4a556aa6a681c6d7aaad075a2;hpb=2efd32f697549c59337db5177a93749af8e605d8;p=github%2FChocobozzz%2FPeerTube.git diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index b9aa223cf..8381745f5 100644 --- a/client/src/app/shared/misc/utils.ts +++ b/client/src/app/shared/misc/utils.ts @@ -17,7 +17,7 @@ function getParameterByName (name: string, url: string) { return decodeURIComponent(results[2].replace(/\+/g, ' ')) } -function populateAsyncUserVideoChannels (authService: AuthService, channel: any[]) { +function populateAsyncUserVideoChannels (authService: AuthService, channel: { id: number, label: string, support: string }[]) { return new Promise(res => { authService.userInformationLoaded .subscribe( @@ -28,7 +28,7 @@ function populateAsyncUserVideoChannels (authService: AuthService, channel: any[ const videoChannels = user.videoChannels if (Array.isArray(videoChannels) === false) return - videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName })) + videoChannels.forEach(c => channel.push({ id: c.id, label: c.displayName, support: c.support })) return res() } @@ -55,6 +55,15 @@ function immutableAssign (target: A, source: B) { return Object.assign({}, target, source) } +function objectToUrlEncoded (obj: any) { + const str: string[] = [] + for (const key of Object.keys(obj)) { + str.push(encodeURIComponent(key) + '=' + encodeURIComponent(obj[key])) + } + + return str.join('&') +} + // Thanks: https://gist.github.com/ghinda/8442a57f22099bdb2e34 function objectToFormData (obj: any, form?: FormData, namespace?: string) { let fd = form || new FormData() @@ -72,7 +81,7 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) { } if (obj[key] !== null && typeof obj[ key ] === 'object' && !(obj[ key ] instanceof File)) { - objectToFormData(obj[ key ], fd, key) + objectToFormData(obj[ key ], fd, formKey) } else { fd.append(formKey, obj[ key ]) } @@ -87,26 +96,19 @@ function lineFeedToHtml (obj: object, keyToNormalize: string) { }) } -// Try to cache a little bit window.innerWidth -let windowInnerWidth = window.innerWidth -setInterval(() => windowInnerWidth = window.innerWidth, 500) - -function isInSmallView () { - return windowInnerWidth < 600 -} - -function isInMobileView () { - return windowInnerWidth < 500 +function removeElementFromArray (arr: T[], elem: T) { + const index = arr.indexOf(elem) + if (index !== -1) arr.splice(index, 1) } export { + objectToUrlEncoded, getParameterByName, populateAsyncUserVideoChannels, getAbsoluteAPIUrl, dateToHuman, - isInSmallView, - isInMobileView, immutableAssign, objectToFormData, - lineFeedToHtml + lineFeedToHtml, + removeElementFromArray }