cardHooks take priority over user card options

bustle · Feb 9, 2017 · d35a903 · d35a903
1 parent b451a22
commit d35a903
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/addon/components/mobiledoc-editor/component.js b/addon/components/mobiledoc-editor/component.js
@@ -220,7 +220,11 @@ export default Component.extend({
         this.get('componentAtoms').removeObject(atom);
       }
     };
-    editorOptions.cardOptions = assign(componentHooks, editorOptions.cardOptions);
+    if (editorOptions.cardOptions) {
+      editorOptions.cardOptions = assign(editorOptions.cardOptions, componentHooks);
+    } else {
+      editorOptions.cardOptions = componentHooks;
+    }
     editor = new Editor(editorOptions);
     editor.willRender(() => {
       // The editor's render/rerender will happen after this `editor.willRender`,