diff options
Diffstat (limited to 'client/src/app/shared/misc/utils.ts')
-rw-r--r-- | client/src/app/shared/misc/utils.ts | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/client/src/app/shared/misc/utils.ts b/client/src/app/shared/misc/utils.ts index c8b7ebc67..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) { | |||
102 | return fd | 102 | return fd |
103 | } | 103 | } |
104 | 104 | ||
105 | function lineFeedToHtml (obj: object, keyToNormalize: string) { | 105 | function objectLineFeedToHtml (obj: any, keyToNormalize: string) { |
106 | return immutableAssign(obj, { | 106 | return immutableAssign(obj, { |
107 | [keyToNormalize]: obj[keyToNormalize].replace(/\r?\n|\r/g, '<br />') | 107 | [keyToNormalize]: lineFeedToHtml(obj[keyToNormalize]) |
108 | }) | 108 | }) |
109 | } | 109 | } |
110 | 110 | ||
111 | function lineFeedToHtml (text: string) { | ||
112 | if (!text) return text | ||
113 | |||
114 | return text.replace(/\r?\n|\r/g, '<br />') | ||
115 | } | ||
116 | |||
111 | function removeElementFromArray <T> (arr: T[], elem: T) { | 117 | function removeElementFromArray <T> (arr: T[], elem: T) { |
112 | const index = arr.indexOf(elem) | 118 | const index = arr.indexOf(elem) |
113 | if (index !== -1) arr.splice(index, 1) | 119 | if (index !== -1) arr.splice(index, 1) |
@@ -124,9 +130,14 @@ function sortBy (obj: any[], key1: string, key2?: string) { | |||
124 | }) | 130 | }) |
125 | } | 131 | } |
126 | 132 | ||
133 | function scrollToTop () { | ||
134 | window.scroll(0, 0) | ||
135 | } | ||
136 | |||
127 | export { | 137 | export { |
128 | sortBy, | 138 | sortBy, |
129 | durationToString, | 139 | durationToString, |
140 | lineFeedToHtml, | ||
130 | objectToUrlEncoded, | 141 | objectToUrlEncoded, |
131 | getParameterByName, | 142 | getParameterByName, |
132 | populateAsyncUserVideoChannels, | 143 | populateAsyncUserVideoChannels, |
@@ -134,6 +145,7 @@ export { | |||
134 | dateToHuman, | 145 | dateToHuman, |
135 | immutableAssign, | 146 | immutableAssign, |
136 | objectToFormData, | 147 | objectToFormData, |
137 | lineFeedToHtml, | 148 | objectLineFeedToHtml, |
138 | removeElementFromArray | 149 | removeElementFromArray, |
150 | scrollToTop | ||
139 | } | 151 | } |