Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Load raw hbs templates correctly from theme javascripts folder

This commit is contained in:
David Taylor 2019-09-13 18:01:16 +01:00
parent b0211772cb
commit 98719bee10
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/theme_field.rb
View File

@ -138,7 +138,7 @@ class ThemeField < ActiveRecord::Base
when "hbs" when "hbs"
js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content) js_compiler.append_ember_template(filename.sub("discourse/templates/", ""), content)
when "raw.hbs" when "raw.hbs"
js_compiler.append_raw_template(filename, content) js_compiler.append_raw_template(filename.sub("discourse/templates/", ""), content)
else else
raise ThemeJavascriptCompiler::CompileError.new(I18n.t("themes.compile_error.unrecognized_extension", extension: extension)) raise ThemeJavascriptCompiler::CompileError.new(I18n.t("themes.compile_error.unrecognized_extension", extension: extension))
end end

4
spec/models/theme_field_spec.rb
View File

@ -170,13 +170,13 @@ HTML
expect(js_field.reload.value_baked).to eq(expected_js.strip) expect(js_field.reload.value_baked).to eq(expected_js.strip)
expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["discovery"]') expect(hbs_field.reload.value_baked).to include('Ember.TEMPLATES["discovery"]')
expect(raw_hbs_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["discourse/templates/discovery"]') expect(raw_hbs_field.reload.value_baked).to include('Discourse.RAW_TEMPLATES["discovery"]')
expect(unknown_field.reload.value_baked).to eq("") expect(unknown_field.reload.value_baked).to eq("")
expect(unknown_field.reload.error).to eq(I18n.t("themes.compile_error.unrecognized_extension", extension: "blah")) expect(unknown_field.reload.error).to eq(I18n.t("themes.compile_error.unrecognized_extension", extension: "blah"))
# All together # All together
expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]') expect(theme.javascript_cache.content).to include('Ember.TEMPLATES["discovery"]')
expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discourse/templates/discovery"]') expect(theme.javascript_cache.content).to include('Discourse.RAW_TEMPLATES["discovery"]')
expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"') expect(theme.javascript_cache.content).to include('define("discourse/controllers/discovery"')
expect(theme.javascript_cache.content).to include("var settings =") expect(theme.javascript_cache.content).to include("var settings =")
end end