[Rt-commit] rt branch, 4.6/do-not-reminify-js-files, created. rt-4.4.4-448-g021223ba1

[? sunnavy]

The branch, 4.6/do-not-reminify-js-files has been created
        at  021223ba172a4e16979494d52612888868111ba6 (commit)

- Log -----------------------------------------------------------------
commit 021223ba172a4e16979494d52612888868111ba6
Author: sunnavy <sunnavy at bestpractical.com>
Date:   Wed Oct 23 04:42:18 2019 +0800

    Do not re-minify those already minified js files
    
    There is no need to do so, and even worse, we found that current
    JavaScript::Minifier::XS can't minify ckeditor.js successfully(it
    truncates the content).

diff --git a/lib/RT/Interface/Web.pm b/lib/RT/Interface/Web.pm
index afabac5af..93b3a7703 100644
--- a/lib/RT/Interface/Web.pm
+++ b/lib/RT/Interface/Web.pm
@@ -137,10 +137,10 @@ sub JSFiles {
         mousetrap.min.js
         keyboard-shortcuts.js
         assets.js
-        /static/RichText5/ckeditor.js
+        /static/RichText5/ckeditor.min.js
         dropzone.min.js
         quoteselection.js
-        fontawesome.js
+        fontawesome.min.js
         rights-inspector.js
         }, RT->Config->Get('JSFiles');
 }
diff --git a/lib/RT/Squish/JS.pm b/lib/RT/Squish/JS.pm
index 61d83d3fc..1ff12e0d3 100644
--- a/lib/RT/Squish/JS.pm
+++ b/lib/RT/Squish/JS.pm
@@ -81,14 +81,19 @@ sub Squish {
         my $res = RT::Interface::Web::Handler->GetStatic($uri);
 
         if ($res->is_success) {
-            $content .= $res->decoded_content . "\n";
+            if ( $file =~ /\.min\.js$/ ) {
+                $content .= $res->decoded_content . "\n";
+            }
+            else {
+                $content .= $self->Filter($res->decoded_content) . "\n";
+            }
         } else {
             RT->Logger->error("Unable to fetch $uri for JS Squishing: " . $res->status_line);
             next;
         }
     }
 
-    return $self->Filter($content);
+    return $content;
 }
 
 sub Filter {
diff --git a/share/static/RichText5/ckeditor.js b/share/static/RichText5/ckeditor.min.js
similarity index 100%
rename from share/static/RichText5/ckeditor.js
rename to share/static/RichText5/ckeditor.min.js
diff --git a/share/static/js/fontawesome.js b/share/static/js/fontawesome.min.js
similarity index 100%
rename from share/static/js/fontawesome.js
rename to share/static/js/fontawesome.min.js

-----------------------------------------------------------------------