erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Remove deepMerge function from emoji_utils

Browse source 
The deepMerge function was removed from the emoji_utils file. This function was not used in the code and was deemed unnecessary, hence it was removed. Also, with its removal, the corresponding import was deleted.
This commit is contained in:
taichi221228 2024-05-02 15:37:11 +09:00
parent 22b75382d1
commit bee50d831c
1 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/javascript/mastodon/features/emoji/emoji_utils.ts
View file

@ -216,31 +216,6 @@ function intersect(a: [], b: []) {
return uniqA.filter((item) => uniqB.includes(item)); return uniqA.filter((item) => uniqB.includes(item));
} }
/* eslint-disable */
// @ts-expect-error
function deepMerge(a, b) {
let o = {};
for (let key in a) {
let originalValue = a[key],
value = originalValue;
if (Object.hasOwn(b, key)) {
value = b[key];
}
if (typeof value === 'object') {
value = deepMerge(originalValue, value);
}
// @ts-expect-error
o[key] = value;
}
return o;
}
// https://github.com/sonicdoe/measure-scrollbar // https://github.com/sonicdoe/measure-scrollbar
function measureScrollbar() { function measureScrollbar() {
const div = document.createElement('div'); const div = document.createElement('div');
@ -263,7 +238,6 @@ export {
getSanitizedData, getSanitizedData,
uniq, uniq,
intersect, intersect,
deepMerge,
unifiedToNative, unifiedToNative,
measureScrollbar, measureScrollbar,
}; };