From a814ef4e939fe42c49955d920201eb34ba8ca3d0 Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Tue, 25 Aug 2020 23:24:12 +0200
Subject: added developer's note to the login screen

---
 dist/js/lib/mergedeep.js | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 dist/js/lib/mergedeep.js

(limited to 'dist/js/lib/mergedeep.js')

diff --git a/dist/js/lib/mergedeep.js b/dist/js/lib/mergedeep.js
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From d9969379798e23b2a62f8bf6eab3967d0497b1a8 Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Sun, 30 Aug 2020 20:14:01 +0200
Subject: popravil meal selection

---
 dist/js/lib/mergedeep.js | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

(limited to 'dist/js/lib/mergedeep.js')

diff --git a/dist/js/lib/mergedeep.js b/dist/js/lib/mergedeep.js
index fa2403d..a56aa1d 100755
--- a/dist/js/lib/mergedeep.js
+++ b/dist/js/lib/mergedeep.js
@@ -1,4 +1,31 @@
+// https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge
+/**
+ * Simple object check.
+ * @param item
+ * @returns {boolean}
+ */
+function isObject(item) {
+    return (item && typeof item === 'object' && !Array.isArray(item));
+}
 
-function isObject(item){return(item&&typeof item==='object'&&!Array.isArray(item));}
-function mergeDeep(target,...sources){if(!sources.length)return target;const source=sources.shift();if(isObject(target)&&isObject(source)){for(const key in source){if(isObject(source[key])){if(!target[key])Object.assign(target,{[key]:{}});mergeDeep(target[key],source[key]);}else{Object.assign(target,{[key]:source[key]});}}}
-return mergeDeep(target,...sources);}
\ No newline at end of file
+/**
+ * Deep merge two objects.
+ * @param target
+ * @param ...sources
+ */
+function mergeDeep(target, ...sources) {
+    if (!sources.length) return target;
+    const source = sources.shift();
+
+    if (isObject(target) && isObject(source)) {
+        for (const key in source) {
+            if (isObject(source[key])) {
+                if (!target[key]) Object.assign(target, { [key]: {} });
+                mergeDeep(target[key], source[key]);
+            } else {
+                Object.assign(target, { [key]: source[key] });
+            }
+        }
+    }
+  return mergeDeep(target, ...sources);
+}
-- 
cgit v1.2.3


From 78f4cb39ab3753cef0a6d16d9b3d842e8c3c78a1 Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Sun, 30 Aug 2020 20:15:23 +0200
Subject: minified after dev on meals

---
 dist/js/lib/mergedeep.js | 33 +++------------------------------
 1 file changed, 3 insertions(+), 30 deletions(-)

(limited to 'dist/js/lib/mergedeep.js')

diff --git a/dist/js/lib/mergedeep.js b/dist/js/lib/mergedeep.js
index a56aa1d..fa2403d 100755
--- a/dist/js/lib/mergedeep.js
+++ b/dist/js/lib/mergedeep.js
@@ -1,31 +1,4 @@
-// https://stackoverflow.com/questions/27936772/how-to-deep-merge-instead-of-shallow-merge
-/**
- * Simple object check.
- * @param item
- * @returns {boolean}
- */
-function isObject(item) {
-    return (item && typeof item === 'object' && !Array.isArray(item));
-}
 
-/**
- * Deep merge two objects.
- * @param target
- * @param ...sources
- */
-function mergeDeep(target, ...sources) {
-    if (!sources.length) return target;
-    const source = sources.shift();
-
-    if (isObject(target) && isObject(source)) {
-        for (const key in source) {
-            if (isObject(source[key])) {
-                if (!target[key]) Object.assign(target, { [key]: {} });
-                mergeDeep(target[key], source[key]);
-            } else {
-                Object.assign(target, { [key]: source[key] });
-            }
-        }
-    }
-  return mergeDeep(target, ...sources);
-}
+function isObject(item){return(item&&typeof item==='object'&&!Array.isArray(item));}
+function mergeDeep(target,...sources){if(!sources.length)return target;const source=sources.shift();if(isObject(target)&&isObject(source)){for(const key in source){if(isObject(source[key])){if(!target[key])Object.assign(target,{[key]:{}});mergeDeep(target[key],source[key]);}else{Object.assign(target,{[key]:source[key]});}}}
+return mergeDeep(target,...sources);}
\ No newline at end of file
-- 
cgit v1.2.3