Skip to content

Commit 818f6f4

Browse files
committed
Merge pull request #514 from tricknotes/fix-for-engine
Don't depend on `Rails.configuration` in generator template for Rails Engine
2 parents a395976 + d96b40a commit 818f6f4

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

lib/generators/templates/application.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#= require jquery
22
#= require jquery_ujs
3-
<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
3+
<%= "#= require handlebars\n" if Ember::Handlebars::Template.handlebars_available? -%>
44
#= require ./environment
55
#= require ember
66
#= require ember-data

lib/generators/templates/application.em

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#= require jquery
22
#= require jquery_ujs
3-
<%= "#= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
3+
<%= "#= require handlebars\n" if Ember::Handlebars::Template.handlebars_available? -%>
44
#= require ./environment
55
#= require ember
66
#= require ember-data

lib/generators/templates/application.es6

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//= require jquery
22
//= require jquery_ujs
3-
<%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
3+
<%= "//= require handlebars\n" if Ember::Handlebars::Template.handlebars_available? -%>
44
//= require ./environment
55
//= require ember
66
//= require ember-data

lib/generators/templates/application.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
//= require jquery
22
//= require jquery_ujs
3-
<%= "//= require handlebars\n" if ::Rails.configuration.handlebars.ember_template == 'Handlebars' -%>
3+
<%= "//= require handlebars\n" if Ember::Handlebars::Template.handlebars_available? -%>
44
//= require ./environment
55
//= require ember
66
//= require ember-data

0 commit comments

Comments
 (0)