github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename merge to deepMerge so it's more clear what it's doing

Browse Source
This commit is contained in:
Robin Ward
2020-09-02 12:04:14 -04:00
parent f365d4639a
commit 3a46e44ed8
15 changed files with 36 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse-common/addon/lib/object.js
View File

@ -1,9 +1,9 @@
// a fairly simple deep merge based on: https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6
function isObject(obj) {
return obj && typeof obj === "object";
}
export function merge(...objects) {
// a fairly simple deep merge based on: https://gist.github.com/ahtcx/0cd94e62691f539160b32ecda18af3d6
export function deepMerge(...objects) {
function deepMergeInner(target, source) {
Object.keys(source).forEach(key => {
const targetValue = target[key];