From f578bf512248c609296d2ff0ea2007a6feac561f Mon Sep 17 00:00:00 2001 From: Clemens Date: Fri, 22 Jul 2016 19:07:53 +0200 Subject: file upload updates contentview, editable contentloader, diffs on upload --- web/src/js/utils.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index eceda195..ba07b00a 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -105,3 +105,17 @@ fetchApi.put = (url, json, options) => fetchApi( ...options } ) + + +export function getDiff(obj1, obj2) { + let result = {...obj2}; + _.forIn(obj1, (value, key) => { + if(_.isEqual(obj2[key], obj1[key])) + result[key] = undefined; + else if(typeof Array.isArray(obj2[key]) && Array.isArray(obj2[key])) + result[key] = {...obj2[key]}; + else if(typeof obj2[key] == 'object' && typeof obj1[key] == 'object') + result[key] = getDiff(obj1[key], obj2[key]); + }); + return result; +} -- cgit v1.2.3 From 68e437a740a1e3d7356c4f637337aba471ec222f Mon Sep 17 00:00:00 2001 From: Clemens Date: Mon, 25 Jul 2016 17:33:36 +0200 Subject: rewrite getDiff --- web/src/js/utils.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index ba07b00a..d3b99bd0 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -109,13 +109,12 @@ fetchApi.put = (url, json, options) => fetchApi( export function getDiff(obj1, obj2) { let result = {...obj2}; - _.forIn(obj1, (value, key) => { - if(_.isEqual(obj2[key], obj1[key])) + for(let key in obj1) { + if(_.isEqual(obj2[key], obj1[key])) result[key] = undefined; - else if(typeof Array.isArray(obj2[key]) && Array.isArray(obj2[key])) - result[key] = {...obj2[key]}; - else if(typeof obj2[key] == 'object' && typeof obj1[key] == 'object') + else if(!(Array.isArray(obj2[key]) && Array.isArray(obj1[key])) && + typeof obj2[key] == 'object' && typeof obj1[key] == 'object') result[key] = getDiff(obj1[key], obj2[key]); - }); + } return result; } -- cgit v1.2.3 From 70dbd1b32d13d30e15c03ee91b0fab7bfdf429b3 Mon Sep 17 00:00:00 2001 From: Maximilian Hils Date: Mon, 25 Jul 2016 17:03:50 -0700 Subject: web: refactor ContentLoader --- web/src/js/utils.js | 1 - 1 file changed, 1 deletion(-) (limited to 'web/src/js/utils.js') diff --git a/web/src/js/utils.js b/web/src/js/utils.js index cc17c565..e44182d0 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -124,7 +124,6 @@ export const pure = renderFn => class extends React.Component { static displayName = renderFn.name shouldComponentUpdate(nextProps) { - console.log(!shallowEqual(this.props, nextProps)) return !shallowEqual(this.props, nextProps) } -- cgit v1.2.3