fix bad merge

fix merge part duex
toddjordan · Aug 19, 2016 · 7117474 · 7117474
1 parent d2b80f8
commit 7117474
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/addon/components/dynamic-form.js b/addon/components/dynamic-form.js
@@ -19,16 +19,14 @@ const DynamicForm = Ember.Component.extend({
   formRenderer: null,
 
   init() {
-    let renderer = this.get('_renderer');
-    if (!renderer) {
-      let container = getOwner(this);
-      let config = container.resolveRegistration('config:environment');
-      if (config.dynamicForms && config.dynamicForms.renderer) {
-        renderer = container.lookup(`${config.dynamicForms.renderer}:dynamic-forms.renderers`);
-      } else {
-        renderer = container.lookup('alpaca:dynamic-forms.renderers');
-      }
-
+    this._super(...arguments);
+    let container = getOwner(this);
+    let config = container.resolveRegistration('config:environment');
+    if (config.dynamicForms && config.dynamicForms.renderer) {
+      set(this, 'formRenderer', container.lookup(`${config.dynamicForms.renderer}:dynamic-forms.renderers`));
+    } else {
+      set(this, 'formRenderer', container.lookup('alpaca:dynamic-forms.renderers'));
+    }
   },
 
   _render() {