discourse/discourse
1
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-03-09 14:34:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Theme settings are referenced in JS by settings, not themeSetting

Browse Source
This commit is contained in:
David Taylor 2019-01-17 12:24:21 +00:00
parent 880311dd4d
commit 5bfa661a87
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/theme_field.rb
View File

@ -60,7 +60,7 @@ class ThemeField < ActiveRecord::Base
validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i }, validates :name, format: { with: /\A[a-z_][a-z0-9_-]*\z/i },
if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) } if: Proc.new { |field| ThemeField.theme_var_type_ids.include?(field.type_id) }
COMPILER_VERSION = 7 COMPILER_VERSION = 8
belongs_to :theme belongs_to :theme

2
lib/theme_javascript_compiler.rb
View File

@ -206,7 +206,7 @@ class ThemeJavascriptCompiler
template = Tilt::ES6ModuleTranspilerTemplate.new {} template = Tilt::ES6ModuleTranspilerTemplate.new {}
wrapped = <<~PLUGIN_API_JS wrapped = <<~PLUGIN_API_JS
if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') { if ('Discourse' in window && typeof Discourse._registerPluginCode === 'function') {
const themeSetting = Discourse.__container__ const settings = Discourse.__container__
.lookup("service:theme-settings") .lookup("service:theme-settings")
.getObjectForTheme(#{@theme_id}); .getObjectForTheme(#{@theme_id});
const themePrefix = (key) => `theme_translations.#{@theme_id}.${key}`; const themePrefix = (key) => `theme_translations.#{@theme_id}.${key}`;