From 0d5cba121b2775b21231388519d75680f23f2e1e Mon Sep 17 00:00:00 2001 From: Book Pauk Date: Sat, 2 Jul 2022 13:02:22 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B9=20=D1=80?= =?UTF-8?q?=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE=D1=80=D0=B8=D0=BD=D0=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/share/utils.js | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/client/share/utils.js b/client/share/utils.js index cfd9dd29..916d94a0 100644 --- a/client/share/utils.js +++ b/client/share/utils.js @@ -107,6 +107,10 @@ export function fromBase64(data) { )); } +export function hasProp(obj, prop) { + return Object.prototype.hasOwnProperty.call(obj, prop); +} + export function getObjDiff(oldObj, newObj, opts = {}) { const { exclude = [], @@ -126,7 +130,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) { for (const key of Object.keys(oldObj)) { const kp = `${keyPath}${key}`; - if (newObj.hasOwnProperty(key)) { + if (Object.prototype.hasOwnProperty.call(newObj, key)) { if (ex.has(kp)) continue; @@ -149,7 +153,7 @@ export function getObjDiff(oldObj, newObj, opts = {}) { if (exAdd.has(kp)) continue; - if (!oldObj.hasOwnProperty(key)) { + if (!Object.prototype.hasOwnProperty.call(oldObj, key)) { result.add[key] = _.cloneDeep(newObj[key]); } } @@ -213,7 +217,7 @@ export function applyObjDiff(obj, diff, opts = {}) { const change = diff.change; for (const key of Object.keys(change)) { - if (result.hasOwnProperty(key)) { + if (Object.prototype.hasOwnProperty.call(result, key)) { if (_.isObject(change[key])) { result[key] = applyObjDiff(result[key], change[key], opts); } else {