[Rt-commit] rt branch, 4.4-trunk, updated. rt-4.4.1-295-g7b70c9f

[Shawn Moore]

The branch, 4.4-trunk has been updated
       via  7b70c9faddb07dcc6d1eec634625e35038a4ee31 (commit)
       via  c68183a09132fd119fce6d18a0941f7220569397 (commit)
      from  9b8ae6f95199587310f61dab282b791d603a26a0 (commit)

Summary of changes:
 lib/RT/Squish/JS.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit c68183a09132fd119fce6d18a0941f7220569397
Author: Brian C. Duggan <brian at bestpractical.com>
Date:   Thu Jan 26 11:34:40 2017 -0500

    Append newline after concatenating each JS file
    
    This applies before minification.
    
    This change prevents a '//' comment at the end of a JS file without
    its own newline from gobbling up code in the first line of the next JS
    file.
    
    Fixes: I#32539

diff --git a/lib/RT/Squish/JS.pm b/lib/RT/Squish/JS.pm
index 4ec8f98..4091c83 100644
--- a/lib/RT/Squish/JS.pm
+++ b/lib/RT/Squish/JS.pm
@@ -81,7 +81,7 @@ sub Squish {
         my $res = RT::Interface::Web::Handler->GetStatic($uri);
 
         if ($res->is_success) {
-            $content .= $res->decoded_content;
+            $content .= $res->decoded_content . "\n";
         } else {
             RT->Logger->error("Unable to fetch $uri for JS Squishing: " . $res->status_line);
             next;

commit 7b70c9faddb07dcc6d1eec634625e35038a4ee31
Merge: 9b8ae6f c68183a
Author: Shawn M Moore <shawn at bestpractical.com>
Date:   Thu Jan 26 12:37:26 2017 -0500

    Merge branch '4.4/js-concat-newline' into 4.4-trunk


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