Исправление бага - не изменялись хоткеи в настройках

client/share/utils.js

@@ -103,30 +103,57 @@ export function fromBase64(data) {
     ));
 }
 
-export function getObjDiff(oldObj, newObj) {
+export function getObjDiff(oldObj, newObj, opts = {}) {
-    const result = {__isDiff: true, change: {}, add: {}, del: []};
+    const {
+        exclude = [],
+        excludeAdd = [],
+        excludeDel = [],
+    } = opts;
 
-    for (const key of Object.keys(oldObj)) {
+    const ex = new Set(exclude);
-        if (newObj.hasOwnProperty(key)) {
+    const exAdd = new Set(excludeAdd);
-            if (!_.isEqual(oldObj[key], newObj[key])) {
+    const exDel = new Set(excludeDel);
-                if (_.isObject(oldObj[key]) && _.isObject(newObj[key])) {
+
-                    result.change[key] = getObjDiff(oldObj[key], newObj[key]);
+    const makeObjDiff = (oldObj, newObj, keyPath) => {
-                } else {
+        const result = {__isDiff: true, change: {}, add: {}, del: []};
-                    result.change[key] = _.cloneDeep(newObj[key]);
+
+        keyPath = `${keyPath}${keyPath ? '/' : ''}`;
+
+        for (const key of Object.keys(oldObj)) {
+            const kp = `${keyPath}${key}`;
+
+            if (newObj.hasOwnProperty(key)) {
+                if (ex.has(kp))
+                    continue;
+
+                if (!_.isEqual(oldObj[key], newObj[key])) {
+                    if (_.isObject(oldObj[key]) && _.isObject(newObj[key])) {
+                        result.change[key] = makeObjDiff(oldObj[key], newObj[key], kp);
+                    } else {
+                        result.change[key] = _.cloneDeep(newObj[key]);
+                    }
                 }
+            } else {
+                if (exDel.has(kp))
+                    continue;
+                result.del.push(key);
             }
-        } else {
-            result.del.push(key);
         }
+
+        for (const key of Object.keys(newObj)) {
+            const kp = `${keyPath}${key}`;
+            if (exAdd.has(kp))
+                continue;
+
+            if (!oldObj.hasOwnProperty(key)) {
+                result.add[key] = _.cloneDeep(newObj[key]);
+            }
+        }
+
+        return result;
     }
 
-    for (const key of Object.keys(newObj)) {
+    return makeObjDiff(oldObj, newObj, '');
-        if (!oldObj.hasOwnProperty(key)) {
-            result.add[key] = _.cloneDeep(newObj[key]);
-        }
-    }
-
-    return result;
 }
 
 export function isObjDiff(diff) {

client/store/modules/reader.js

@@ -268,9 +268,12 @@ for (const button of toolButtons)
 for (const hotKey of hotKeys)
     settingDefaults.userHotKeys[hotKey.name] = hotKey.codes;
 
+const excludeDiffHotKeys = [];
+for (const hotKey of hotKeys)
+    excludeDiffHotKeys.push(`userHotKeys/${hotKey.name}`);
+
 function addDefaultsToSettings(settings) {
-    const diff = utils.getObjDiff(settings, settingDefaults);
+    const diff = utils.getObjDiff(settings, settingDefaults, {exclude: excludeDiffHotKeys});
-    
     if (!utils.isEmptyObjDiffDeep(diff, {isApplyChange: false})) {
         return utils.applyObjDiff(settings, diff, {isApplyChange: false});
     }