diff options
| author | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2015-07-10 18:15:08 -0700 |
| commit | 88bf5db0cca989c51237c661a13078eef08b3674 (patch) | |
| tree | 0a84e1b5e7fd239f57fab678bf40c5311b0064a0 /rt/lib/RT/Squish/JS.pm | |
| parent | 9c15ffe3a5ee987e30e10c6a0ad1b5bf0b2a12e3 (diff) | |
| parent | e7eb845db1afab1cbdbc34ff9c387c5ac554659e (diff) | |
Merge branch 'FREESIDE_4_BRANCH' of git.freeside.biz:/home/git/freeside into 4.x
Diffstat (limited to 'rt/lib/RT/Squish/JS.pm')
| -rw-r--r-- | rt/lib/RT/Squish/JS.pm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/rt/lib/RT/Squish/JS.pm b/rt/lib/RT/Squish/JS.pm index 9a4cac582..c44f45570 100644 --- a/rt/lib/RT/Squish/JS.pm +++ b/rt/lib/RT/Squish/JS.pm @@ -2,7 +2,7 @@ # # COPYRIGHT: # -# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC +# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC # <sales@bestpractical.com> # # (Except where explicitly superseded by other copyright notices) @@ -73,14 +73,16 @@ not only concatenate files, but also minify them sub Squish { my $self = shift; - my $content; + my $content = ""; - for my $file ( RT->Config->Get('JSFiles') ) { - my $path = "/NoAuth/js/$file"; - if ( $HTML::Mason::Commands::m->comp_exists($path) ) { - $content .= $HTML::Mason::Commands::m->scomp($path); + for my $file ( RT::Interface::Web->JSFiles ) { + my $uri = $file =~ m{^/} ? $file : "/static/js/$file"; + my $res = RT::Interface::Web::Handler->GetStatic($uri); + + if ($res->is_success) { + $content .= $res->decoded_content; } else { - RT->Logger->error("Unable to open $path for JS Squishing"); + RT->Logger->error("Unable to fetch $uri for JS Squishing: " . $res->status_line); next; } } |