X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=client%2Fsrc%2Fapp%2Fshared%2Fmisc%2Futils.ts;h=7cc6055c2ae6c3b355ef7ba0940b77988332232a;hb=1506307f2f903ce0f80155072a33345c702b7c76;hp=78be2e5dda6bd0435a757bd08b61b0bd13ee1df4;hpb=244b4ae3973bc1511464a08158a123767f83179c;p=github%2FChocobozzz%2FPeerTube.git
diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts
index 78be2e5dd..7cc6055c2 100644
--- a/client/src/app/shared/misc/utils.ts
+++ b/client/src/app/shared/misc/utils.ts
@@ -102,12 +102,18 @@ function objectToFormData (obj: any, form?: FormData, namespace?: string) {
return fd
}
-function lineFeedToHtml (obj: any, keyToNormalize: string) {
+function objectLineFeedToHtml (obj: any, keyToNormalize: string) {
return immutableAssign(obj, {
- [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '
')
+ [keyToNormalize]: lineFeedToHtml(obj[keyToNormalize])
})
}
+function lineFeedToHtml (text: string) {
+ if (!text) return text
+
+ return text.replace(/\r?\n|\r/g, '
')
+}
+
function removeElementFromArray (arr: T[], elem: T) {
const index = arr.indexOf(elem)
if (index !== -1) arr.splice(index, 1)
@@ -124,9 +130,14 @@ function sortBy (obj: any[], key1: string, key2?: string) {
})
}
+function scrollToTop () {
+ window.scroll(0, 0)
+}
+
export {
sortBy,
durationToString,
+ lineFeedToHtml,
objectToUrlEncoded,
getParameterByName,
populateAsyncUserVideoChannels,
@@ -134,6 +145,7 @@ export {
dateToHuman,
immutableAssign,
objectToFormData,
- lineFeedToHtml,
- removeElementFromArray
+ objectLineFeedToHtml,
+ removeElementFromArray,
+ scrollToTop
}