X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fapp%2Fshared%2Fmisc%2Futils.ts;h=8381745f5fd4ad8394ea49949e64b269ab9d42d9;hb=0f7fedc39857ebc0eb29182c1588a92b9adfb75a;hp=e2e4c5b36bb3ea2ccb591c7c7fa8b5d036e6d9f1;hpb=6de36768980ef6063b8fcd730b59fa685dd2b99c;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts
index e2e4c5b36..8381745f5 100644
--- a/client/src/app/shared/misc/utils.ts
+++ b/client/src/app/shared/misc/utils.ts
@@ -17,11 +17,7 @@ function getParameterByName (name: string, url: string) {
   return decodeURIComponent(results[2].replace(/\+/g, ' '))
 }
 
-function viewportHeight () {
-  return Math.max(document.documentElement.clientHeight, window.innerHeight || 0)
-}
-
-function populateAsyncUserVideoChannels (authService: AuthService, channel: any[]) {
+function populateAsyncUserVideoChannels (authService: AuthService, channel: { id: number, label: string, support: string }[]) {
   return new Promise(res => {
     authService.userInformationLoaded
       .subscribe(
@@ -32,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()
         }
@@ -59,12 +55,13 @@ function immutableAssign <A, B> (target: A, source: B) {
   return Object.assign({}, target, source)
 }
 
-function isInSmallView () {
-  return window.innerWidth < 600
-}
+function objectToUrlEncoded (obj: any) {
+  const str: string[] = []
+  for (const key of Object.keys(obj)) {
+    str.push(encodeURIComponent(key) + '=' + encodeURIComponent(obj[key]))
+  }
 
-function isInMobileView () {
-  return window.innerWidth < 500
+  return str.join('&')
 }
 
 // Thanks: https://gist.github.com/ghinda/8442a57f22099bdb2e34
@@ -78,8 +75,13 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) {
 
     if (obj[key] === undefined) continue
 
-    if (typeof obj[ key ] === 'object' && !(obj[ key ] instanceof File)) {
-      objectToFormData(obj[ key ], fd, key)
+    if (Array.isArray(obj[key]) && obj[key].length === 0) {
+      fd.append(key, null)
+      continue
+    }
+
+    if (obj[key] !== null && typeof obj[ key ] === 'object' && !(obj[ key ] instanceof File)) {
+      objectToFormData(obj[ key ], fd, formKey)
     } else {
       fd.append(formKey, obj[ key ])
     }
@@ -88,14 +90,25 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) {
   return fd
 }
 
+function lineFeedToHtml (obj: object, keyToNormalize: string) {
+  return immutableAssign(obj, {
+    [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '<br />')
+  })
+}
+
+function removeElementFromArray <T> (arr: T[], elem: T) {
+  const index = arr.indexOf(elem)
+  if (index !== -1) arr.splice(index, 1)
+}
+
 export {
-  viewportHeight,
+  objectToUrlEncoded,
   getParameterByName,
   populateAsyncUserVideoChannels,
   getAbsoluteAPIUrl,
   dateToHuman,
-  isInSmallView,
-  isInMobileView,
   immutableAssign,
-  objectToFormData
+  objectToFormData,
+  lineFeedToHtml,
+  removeElementFromArray
 }