Merge pull request #477 from mccxiv/fix-shortcuts

Fix shortcuts, fixes #473

Author: mccxiv

src/tc-renderer/store/modules/settings/validate-settings.js

@@ -20,7 +20,8 @@ const fromBlueprint = (blueprint, untrustedObj) => {
       const blueprintType = R.type(value)
       return R.equals(untrustedType, blueprintType) ? untrustedValue : value
     }),
-    unflattenObj
+    unflattenObj,
+    addShortcutsFrom(untrustedObj)
   )(blueprint)
 }
 
@@ -50,6 +51,11 @@ const flattenObjToDotPath = obj => {
   return R.fromPairs(go(obj))
 }
 
+const addShortcutsFrom = untrustedObj => trustedObject => {
+  trustedObject.shortcuts = untrustedObj.shortcuts || {}
+  return trustedObject
+}
+
 export const getValidatedSettings = (settings = {}) => {
   return fromBlueprint(defaults, settings)
 }