github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 23:36:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Code review comments.

Browse Source
This commit is contained in:
Alan Guo Xiang Tan
2021-06-18 10:16:26 +08:00
parent 8e3691d537
commit 44aa46ca05
29 changed files with 159 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/stylesheet/manager/builder.rb
View File

@ -3,7 +3,7 @@
class Stylesheet::Manager::Builder
attr_reader :theme
def initialize(target: :desktop, theme:, color_scheme: nil, manager:)
def initialize(target: :desktop, theme: nil, color_scheme: nil, manager:)
@target = target
@theme = theme
@color_scheme = color_scheme
@ -115,11 +115,11 @@ class Stylesheet::Manager::Builder
def qualified_target
if is_theme?
"#{@target}_#{theme.id}"
"#{@target}_#{theme&.id}"
elsif @color_scheme
"#{@target}_#{scheme_slug}_#{@color_scheme&.id.to_s}"
else
scheme_string = theme && theme.color_scheme ? "_#{theme.color_scheme.id}" : ""
scheme_string = theme&.color_scheme ? "_#{theme.color_scheme.id}" : ""
"#{@target}#{scheme_string}"
end
end
@ -186,10 +186,10 @@ class Stylesheet::Manager::Builder
end
def settings_digest
theme_ids = Theme.is_parent_theme?(theme.id) ? @manager.theme_ids : [theme.id]
themes =
if Theme.is_parent_theme?(theme.id)
if !theme
[]
elsif Theme.is_parent_theme?(theme.id)
@manager.load_themes(@manager.theme_ids)
else
[@manager.get_theme(theme.id)]
@ -211,7 +211,7 @@ class Stylesheet::Manager::Builder
def uploads_digest
sha1s = []
theme.upload_fields.map do |upload_field|
(theme&.upload_fields || []).map do |upload_field|
sha1s << upload_field.upload.sha1
end
@ -247,7 +247,9 @@ class Stylesheet::Manager::Builder
def resolve_baked_field(target, name)
theme_ids =
if Theme.is_parent_theme?(theme.id)
if !theme
[]
elsif Theme.is_parent_theme?(theme.id)
@manager.theme_ids
else
[theme.id]