Merge pull request #29 from rwjblue/prevent-error-when-helper-is-unde…

…fined Handle Ember.Helper being undefined (Ember < 1.13).
ember-cli · Aug 30, 2015 · 50ddcfd · 50ddcfd
2 parents f356f9f + e4529bb
commit 50ddcfd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/app-shims.js b/app-shims.js
@@ -74,7 +74,7 @@
       },
       'ember-helper': {
         'default':  Ember.Helper,
-        'helper':   Ember.Helper.helper
+        'helper':   Ember.Helper && Ember.Helper.helper
       },
       'ember-instrumentation': {
         'instrument':   Ember.Instrumentation.instrument,