diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2015-07-26 15:41:26 -0700 |
| commit | 9aee669886202be7035e6c6049fc71bc99dd3013 (patch) | |
| tree | 2fd5bf6de74f3d99270587ffb1833e4188a6373d /rt/lib/RT/Squish | |
| parent | ac20214d38d9af00430423f147b5a0e50751b050 (diff) | |
| parent | 1add633372bdca3cc7163c2ce48363fed3984437 (diff) | |
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'rt/lib/RT/Squish')
| -rw-r--r-- | rt/lib/RT/Squish/CSS.pm | 25 | ||||
| -rw-r--r-- | rt/lib/RT/Squish/JS.pm | 16 |
2 files changed, 12 insertions, 29 deletions
diff --git a/rt/lib/RT/Squish/CSS.pm b/rt/lib/RT/Squish/CSS.pm index 5ce3882cd..ccfbc27ec 100644 --- a/rt/lib/RT/Squish/CSS.pm +++ b/rt/lib/RT/Squish/CSS.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) @@ -78,27 +78,8 @@ sub Squish { return $self->concatenate( "$style/main.css", RT->Config->Get('CSSFiles') ); } -=head2 file_handle - -subclass CSS::Squish::file_handle for RT - -=cut - -sub file_handle { - my $self = shift; - my $file = shift; - - my $path = "/NoAuth/css/$file"; - my $content; - if ( $HTML::Mason::Commands::m->comp_exists($path) ) { - $content = $HTML::Mason::Commands::m->scomp("$path"); - } else { - RT->Logger->error("Unable to open $path for CSS Squishing"); - return undef; - } - - open( my $fh, '<', \$content ) or die $!; - return $fh; +sub roots { + map { "$_/css" } RT::Interface::Web->StaticRoots } 1; 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; } } |