From 7cb6082f91dba5e61ef0c48a32b61d22ff8c1d89 Mon Sep 17 00:00:00 2001
From: Kyle Zhao <kzhao.sw@gmail.com>
Date: Thu, 15 Nov 2018 16:13:18 -0500
Subject: [PATCH] FIX: S3 CDN for markdown it bundle

---
 app/helpers/application_helper.rb | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 38893536a11..03a0b608633 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -58,7 +58,7 @@ module ApplicationHelper
     request.env["HTTP_ACCEPT_ENCODING"] =~ /br/
   end
 
-  def preload_script(script)
+  def script_asset_path(script)
     path = asset_path("#{script}.js")
 
     if GlobalSetting.use_s3? && GlobalSetting.s3_cdn_url
@@ -89,6 +89,12 @@ module ApplicationHelper
       end
     end
 
+    path
+  end
+
+  def preload_script(script)
+    path = script_asset_path(script)
+
 "<link rel='preload' href='#{path}' as='script'/>
 <script src='#{path}'></script>".html_safe
   end
@@ -422,7 +428,7 @@ module ApplicationHelper
       base_uri: Discourse::base_uri,
       environment: Rails.env,
       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,
       default_locale: SiteSetting.default_locale,
       asset_version: Discourse.assets_digest,