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

DEV: apply new coding standards (#10592)

Browse Source
This commit is contained in:
Joffrey JAFFEUX
2020-09-04 13:42:47 +02:00
committed by GitHub
parent 80dfaeb0d2
commit 52672b9eab
1473 changed files with 9386 additions and 9958 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

@ -5,7 +5,7 @@ function isObject(obj) {
// 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 => {
Object.keys(source).forEach((key) => {
const targetValue = target[key];
const sourceValue = source[key];
@ -24,7 +24,7 @@ export function deepMerge(...objects) {
return target;
}
if (objects.some(object => object && !isObject(object))) {
if (objects.some((object) => object && !isObject(object))) {
throw new Error('deepMerge: all values should be of type "object"');
}