From f5a8587b4cded2577f81692ae84302d5b2041c19 Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Fri, 19 Mar 2021 01:16:43 -0700
Subject: [PATCH 1/4] Avoid using ES6 syntax to prevent Heroku asset
 compilation from failing

---
 app/assets/javascripts/osem.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js
index 636ed959..30993bd7 100644
--- a/app/assets/javascripts/osem.js
+++ b/app/assets/javascripts/osem.js
@@ -148,7 +148,7 @@ function word_count(text, divId, maxcount) {
 };
 
 function fill_if_empty(text_area, filler) {
-    let area = $('#' + text_area);
+    var area = $('#' + text_area);
 
     if (!area.val()) {
         area.val(filler);
@@ -192,11 +192,11 @@ $( document ).ready(function() {
 
     /* Listen for reset template button, wait for confirm, and reset. */
     $('#sub_text_reset').click((e) => {
-        let $selected = $("#event_event_type_id option:selected");
-        let $this = $(e.target);
-        let affirm = confirm($this.data('confirm'));
+        var $selected = $("#event_event_type_id option:selected");
+        var $this = $(e.target);
+        var affirm = confirm($this.data('confirm'));
         if (affirm) {
-            let sub_text = $('#event_submission_text');
+            var sub_text = $('#event_submission_text');
             sub_text.val($selected.data('help'));
             sub_text.trigger('change');
         }

From 28e45d6162e08047913b4c281ac0482723af36a6 Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Fri, 19 Mar 2021 01:21:26 -0700
Subject: [PATCH 2/4] Revert "Avoid using ES6 syntax to prevent Heroku asset
 compilation from failing"

This reverts commit f5a8587b4cded2577f81692ae84302d5b2041c19.
---
 app/assets/javascripts/osem.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/assets/javascripts/osem.js b/app/assets/javascripts/osem.js
index 30993bd7..636ed959 100644
--- a/app/assets/javascripts/osem.js
+++ b/app/assets/javascripts/osem.js
@@ -148,7 +148,7 @@ function word_count(text, divId, maxcount) {
 };
 
 function fill_if_empty(text_area, filler) {
-    var area = $('#' + text_area);
+    let area = $('#' + text_area);
 
     if (!area.val()) {
         area.val(filler);
@@ -192,11 +192,11 @@ $( document ).ready(function() {
 
     /* Listen for reset template button, wait for confirm, and reset. */
     $('#sub_text_reset').click((e) => {
-        var $selected = $("#event_event_type_id option:selected");
-        var $this = $(e.target);
-        var affirm = confirm($this.data('confirm'));
+        let $selected = $("#event_event_type_id option:selected");
+        let $this = $(e.target);
+        let affirm = confirm($this.data('confirm'));
         if (affirm) {
-            var sub_text = $('#event_submission_text');
+            let sub_text = $('#event_submission_text');
             sub_text.val($selected.data('help'));
             sub_text.trigger('change');
         }

From 33af94baddc14d8cc3f92e06f211753b72d7f8a7 Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Fri, 19 Mar 2021 01:22:22 -0700
Subject: [PATCH 3/4] Allow ES6 JS syntax

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 536a8aef..3893e77c 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -26,7 +26,7 @@ Osem::Application.configure do
   config.assets.digest = true
 
   config.assets.css_compressor = :sass
-  config.assets.js_compressor = :uglifier
+  config.assets.js_compressor = Uglifier.new(:harmony => true)
   config.assets.gzip = true
 
   # Defaults to nil and saved in location specified by config.assets.prefix

From 8110d06ca7f9fa5ec52c67acaa390b0d03eaaad4 Mon Sep 17 00:00:00 2001
From: CactusPuppy <puppycactus@gmail.com>
Date: Fri, 19 Mar 2021 01:26:53 -0700
Subject: [PATCH 4/4] Fix Rubocop linting issue

---
 config/environments/production.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environments/production.rb b/config/environments/production.rb
index 3893e77c..d41774af 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -26,7 +26,7 @@ Osem::Application.configure do
   config.assets.digest = true
 
   config.assets.css_compressor = :sass
-  config.assets.js_compressor = Uglifier.new(:harmony => true)
+  config.assets.js_compressor = Uglifier.new(harmony: true)
   config.assets.gzip = true
 
   # Defaults to nil and saved in location specified by config.assets.prefix