IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Correct deprecated theme settings in handlebars templates

Browse Source 
Was overriding the incorrect `themeSetting.blah` syntax, instead of `themeSettings.blah`
This commit is contained in:
David Taylor 2019-01-18 15:39:28 +00:00
parent b9b5527c63
commit 0b6be2cebc
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/theme_javascript_compiler.rb
View File

@ -54,7 +54,7 @@ class ThemeJavascriptCompiler
function manipulatePath(path) { function manipulatePath(path) {
// Override old themeSetting syntax when it's a param inside another node // Override old themeSetting syntax when it's a param inside another node
if(path.parts[0] == "themeSetting"){ if(path.parts[0] == "themeSettings"){
const settingParts = path.parts.slice(1); const settingParts = path.parts.slice(1);
path.type = "SubExpression"; path.type = "SubExpression";
Object.assign(path, generateHelper(settingParts)) Object.assign(path, generateHelper(settingParts))
@ -72,7 +72,7 @@ class ThemeJavascriptCompiler
} }
// Override old themeSetting syntax when it's in its own node // Override old themeSetting syntax when it's in its own node
if (node.path.parts[0] == "themeSetting") { if (node.path.parts[0] == "themeSettings") {
Object.assign(node, generateHelper(node.path.parts.slice(1))) Object.assign(node, generateHelper(node.path.parts.slice(1)))
} }
} }
@ -93,14 +93,14 @@ class ThemeJavascriptCompiler
Handlebars.Compiler.prototype.compile = function(program, options) { Handlebars.Compiler.prototype.compile = function(program, options) {
// `replaceGet()` in raw-handlebars.js.es6 adds a `get` in front of things // `replaceGet()` in raw-handlebars.js.es6 adds a `get` in front of things
// so undo this specific case for the old themeSetting.blah syntax // so undo this specific case for the old themeSettings.blah syntax
let visitor = new Handlebars.Visitor(); let visitor = new Handlebars.Visitor();
visitor.mutating = true; visitor.mutating = true;
visitor.MustacheStatement = (node) => { visitor.MustacheStatement = (node) => {
if(node.path.original == 'get' if(node.path.original == 'get'
&& node.params && node.params
&& node.params[0] && node.params[0]
&& node.params[0].parts[0] == 'themeSetting'){ && node.params[0].parts[0] == 'themeSettings'){
node.path.parts = node.params[0].parts node.path.parts = node.params[0].parts
node.params = [] node.params = []
} }

8
spec/lib/theme_javascript_compiler_spec.rb
View File

@ -55,11 +55,11 @@ describe ThemeJavascriptCompiler do
end end
it 'works with the old settings syntax' do it 'works with the old settings syntax' do
expect(render("{{themeSetting.setting_key}}")). expect(render("{{themeSettings.setting_key}}")).
to eq('setting(22:setting_key)') to eq('setting(22:setting_key)')
# Works when used inside other statements # Works when used inside other statements
expect(render("{{dummy-helper themeSetting.setting_key}}")). expect(render("{{dummy-helper themeSettings.setting_key}}")).
to eq('dummy(setting(22:setting_key))') to eq('dummy(setting(22:setting_key))')
end end
end end
@ -90,11 +90,11 @@ describe ThemeJavascriptCompiler do
end end
it 'works with the old settings syntax' do it 'works with the old settings syntax' do
expect(statement("{{themeSetting.setting_key}}")). expect(statement("{{themeSettings.setting_key}}")).
to eq([[1, [27, "theme-setting", [22, "setting_key"], [["deprecated"], [true]]], false]]) to eq([[1, [27, "theme-setting", [22, "setting_key"], [["deprecated"], [true]]], false]])
# Works when used inside other statements # Works when used inside other statements
expect(statement("{{dummy-helper themeSetting.setting_key}}")). expect(statement("{{dummy-helper themeSettings.setting_key}}")).
to eq([[1, [27, "dummy-helper", [[27, "theme-setting", [22, "setting_key"], [["deprecated"], [true]]]], nil], false]]) to eq([[1, [27, "dummy-helper", [[27, "theme-setting", [22, "setting_key"], [["deprecated"], [true]]]], nil], false]])
end end
end end