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

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

View File

@ -60,7 +60,7 @@ class ThemeField < ActiveRecord::Base
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) }
COMPILER_VERSION = 7
COMPILER_VERSION = 8
belongs_to :theme

View File

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