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 {