github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-24 03:36:18 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: S3 CDN for markdown it bundle

Browse Source
This commit is contained in:
Kyle Zhao
2018-11-15 16:13:18 -05:00
parent 817135fbbf
commit 7cb6082f91
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/helpers/application_helper.rb
View File

@ -58,7 +58,7 @@ module ApplicationHelper
request.env["HTTP_ACCEPT_ENCODING"] =~ /br/ request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
end end
def preload_script(script) def script_asset_path(script)
path = asset_path("#{script}.js") path = asset_path("#{script}.js")
if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url
@ -89,6 +89,12 @@ module ApplicationHelper
end end
end end
path
end
def preload_script(script)
path = script_asset_path(script)
"<link rel='preload' href='#{path}' as='script'/> "<link rel='preload' href='#{path}' as='script'/>
<script src='#{path}'></script>".html_safe <script src='#{path}'></script>".html_safe
end end
@ -422,7 +428,7 @@ module ApplicationHelper
base_uri: Discourse::base_uri, base_uri: Discourse::base_uri,
environment: Rails.env, environment: Rails.env,
letter_avatar_version: LetterAvatar.version, letter_avatar_version: LetterAvatar.version,
markdown_it_url: asset_url('markdown-it-bundle.js'), markdown_it_url: script_asset_path('markdown-it-bundle'),
service_worker_url: service_worker_url, service_worker_url: service_worker_url,
default_locale: SiteSetting.default_locale, default_locale: SiteSetting.default_locale,
asset_version: Discourse.assets_digest, asset_version: Discourse.assets_digest,