Auto merge of #145 - poteto:hotfix-initializer, r=poteto

Hotfix for consuming apps with no defaults defined None
adopted-ember-addons · Feb 18, 2016 · 45b89f8 · 45b89f8
2 parents 0d45a61 + b4be627
commit 45b89f8
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/app/initializers/flash-messages.js b/app/initializers/flash-messages.js
@@ -29,16 +29,17 @@ const addonDefaults = {
 
 export function initialize() {
   const application = arguments[1] || arguments[0];
-  const { flashMessageDefaults } = config;
-  const { injectionFactories } = flashMessageDefaults;
+  const { flashMessageDefaults } = config || {};
+  const { injectionFactories } = flashMessageDefaults || [];
   const options = merge(addonDefaults, flashMessageDefaults);
   const shouldShowDeprecation = !(injectionFactories && injectionFactories.length);
 
   application.register('config:flash-messages', options, { instantiate: false });
   application.inject('service:flash-messages', 'flashMessageDefaults', 'config:flash-messages');
 
   deprecate(INJECTION_FACTORIES_DEPRECATION_MESSAGE, shouldShowDeprecation, {
-    id: 'ember-cli-flash.deprecate-injection-factories'
+    id: 'ember-cli-flash.deprecate-injection-factories',
+    until: '2.0.0'
   });
 
   options.injectionFactories.forEach((factory) => {