[Jifty-commit] r4240 - in jifty/trunk/lib/Jifty: Plugin
jifty-commit at lists.jifty.org
jifty-commit at lists.jifty.org
Mon Oct 15 07:53:20 EDT 2007
Author: clkao
Date: Mon Oct 15 07:53:15 2007
New Revision: 4240
Modified:
jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm
jifty/trunk/lib/Jifty/Web.pm
Log:
Add cdn option to CompressedCSSandJS plugin.
Modified: jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm (original)
+++ jifty/trunk/lib/Jifty/Plugin/CompressedCSSandJS.pm Mon Oct 15 07:53:15 2007
@@ -21,6 +21,7 @@
js: 1
css: 1
jsmin: /path/to/jsmin
+ cdn: 'http://yourcdn.for.static.prefix/'
=head1 DESCRIPTION
@@ -37,7 +38,7 @@
=cut
-__PACKAGE__->mk_accessors(qw(css js jsmin cached_javascript cached_javascript_digest cached_javascript_time ));
+__PACKAGE__->mk_accessors(qw(css js jsmin cached_javascript cached_javascript_digest cached_javascript_time cdn ));
=head2 init
@@ -55,6 +56,7 @@
$self->css( $opt{css} );
$self->js( $opt{js} );
$self->jsmin( $opt{jsmin} );
+ $self->cdn( $opt{cdn} || '');
Jifty::Web->add_trigger(
name => 'include_javascript',
@@ -89,7 +91,7 @@
my $self = shift;
$self->_generate_javascript;
- Jifty->web->out( qq[<script type="text/javascript" src="/__jifty/js/]
+ Jifty->web->out( qq[<script type="text/javascript" src="@{[ $self->cdn ]}/__jifty/js/]
. $self->cached_javascript_digest
. qq[.js"></script>] );
return 0;
Modified: jifty/trunk/lib/Jifty/Web.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web.pm (original)
+++ jifty/trunk/lib/Jifty/Web.pm Mon Oct 15 07:53:15 2007
@@ -1073,12 +1073,13 @@
=cut
sub include_css {
+ # XXX: move to CompressCSSandJS plugin
my $self = shift;
my ($ccjs) = Jifty->find_plugin('Jifty::Plugin::CompressedCSSandJS');
if ( $ccjs && $ccjs->css_enabled ) {
$self->generate_css;
$self->out(
- '<link rel="stylesheet" type="text/css" href="/__jifty/css/'
+ qq{<link rel="stylesheet" type="text/css" href="@{[ $ccjs->cdn ]}/__jifty/css/}
. __PACKAGE__->cached_css_digest . '.css" />'
);
}
More information about the Jifty-commit
mailing list