Prefer user settings during tools merge (#774)

* Prefer user settings during tools merge
codex-team · May 21, 2019 · 5a443b2 · 5a443b2
1 parent 22b9df7
commit 5a443b2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/dist/editor.js b/dist/editor.js
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+
+### 2.14
+
+- `Fix` *Config* — User config now has higher priority than internal settings
+
 ### 2.13
 
 - `Improvements` *BlockSelection* — Block Selection allows to select single editable element via CMD+A

diff --git a/src/components/modules/tools.ts b/src/components/modules/tools.ts
@@ -207,7 +207,7 @@ export default class Tools extends Module {
     /**
      * Assign internal tools
      */
-    _.deepMerge(this.config.tools, this.internalTools);
+    this.config.tools = _.deepMerge({}, this.internalTools, this.config.tools);
 
     if (!this.config.hasOwnProperty('tools') || Object.keys(this.config.tools).length === 0) {
       throw Error('Can\'t start without tools');