mirror of
https://github.com/discourse/discourse.git
synced 2025-05-22 17:51:16 +08:00
DEV: Apply syntax_tree formatting to app/*
This commit is contained in:
@ -9,10 +9,10 @@ class ThemeJavascriptsController < ApplicationController
|
||||
:preload_json,
|
||||
:redirect_to_login_if_required,
|
||||
:verify_authenticity_token,
|
||||
only: [:show, :show_map, :show_tests]
|
||||
only: %i[show show_map show_tests],
|
||||
)
|
||||
|
||||
before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: [:show, :show_map, :show_tests]
|
||||
before_action :is_asset_path, :no_cookies, :apply_cdn_headers, only: %i[show show_map show_tests]
|
||||
|
||||
def show
|
||||
raise Discourse::NotFound unless last_modified.present?
|
||||
@ -24,7 +24,8 @@ class ThemeJavascriptsController < ApplicationController
|
||||
write_if_not_cached(cache_file) do
|
||||
content, has_source_map = query.pluck_first(:content, "source_map IS NOT NULL")
|
||||
if has_source_map
|
||||
content += "\n//# sourceMappingURL=#{params[:digest]}.map?__ws=#{Discourse.current_hostname}\n"
|
||||
content +=
|
||||
"\n//# sourceMappingURL=#{params[:digest]}.map?__ws=#{Discourse.current_hostname}\n"
|
||||
end
|
||||
content
|
||||
end
|
||||
@ -39,9 +40,7 @@ class ThemeJavascriptsController < ApplicationController
|
||||
# Security: safe due to route constraint
|
||||
cache_file = "#{DISK_CACHE_PATH}/#{params[:digest]}.map"
|
||||
|
||||
write_if_not_cached(cache_file) do
|
||||
query.pluck_first(:source_map)
|
||||
end
|
||||
write_if_not_cached(cache_file) { query.pluck_first(:source_map) }
|
||||
|
||||
serve_file(cache_file)
|
||||
end
|
||||
@ -59,9 +58,7 @@ class ThemeJavascriptsController < ApplicationController
|
||||
@cache_file = "#{TESTS_DISK_CACHE_PATH}/#{digest}.js"
|
||||
return render body: nil, status: 304 if not_modified?
|
||||
|
||||
write_if_not_cached(@cache_file) do
|
||||
content
|
||||
end
|
||||
write_if_not_cached(@cache_file) { content }
|
||||
|
||||
serve_file @cache_file
|
||||
end
|
||||
@ -73,13 +70,14 @@ class ThemeJavascriptsController < ApplicationController
|
||||
end
|
||||
|
||||
def last_modified
|
||||
@last_modified ||= begin
|
||||
if params[:action].to_s == "show_tests"
|
||||
File.exist?(@cache_file) ? File.ctime(@cache_file) : nil
|
||||
else
|
||||
query.pluck_first(:updated_at)
|
||||
@last_modified ||=
|
||||
begin
|
||||
if params[:action].to_s == "show_tests"
|
||||
File.exist?(@cache_file) ? File.ctime(@cache_file) : nil
|
||||
else
|
||||
query.pluck_first(:updated_at)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def not_modified?
|
||||
@ -95,10 +93,10 @@ class ThemeJavascriptsController < ApplicationController
|
||||
|
||||
def set_cache_control_headers
|
||||
if Rails.env.development?
|
||||
response.headers['Last-Modified'] = Time.zone.now.httpdate
|
||||
response.headers["Last-Modified"] = Time.zone.now.httpdate
|
||||
immutable_for(1.second)
|
||||
else
|
||||
response.headers['Last-Modified'] = last_modified.httpdate if last_modified
|
||||
response.headers["Last-Modified"] = last_modified.httpdate if last_modified
|
||||
immutable_for(1.year)
|
||||
end
|
||||
end
|
||||
|
Reference in New Issue
Block a user