--- trunk/lib/Frey/Web.pm 2008/12/14 15:13:55 837
+++ trunk/lib/Frey/Web.pm 2008/12/14 22:47:48 839
@@ -174,35 +174,48 @@
}
+sub _add_css_js {
+ my ( $self, $what, $content ) = @_;
+
+ my $tag = $what eq 'css' ? 'style' : 'script';
+ my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
+ my $head;
+
+ my ( $package, $path, $line ) = caller(1);
+
+ if ( $content =~ m{\.(js|css)} ) {
+ $content = "/$content" if -e $content;
+ if ( $what eq 'js' ) {
+ $head = qq|
+ <$tag type="$type" src="$content">
+ /* via $package at $path line $line */
+ $tag>
+ |;
+ } else {
+ $head = qq|
+
+
+ |;
+ }
+ } else {
+ $head = qq|
+ <$tag type="$type">
+ /* via $package at $path line $line */
+ $content
+ $tag>
+ |;
+ };
+ $self->add_head( $head );
+}
+
sub add_css {
my ($self,$css) = @_;
- my ( $package, $path, $line ) = caller;
- $self->add_head( qq|
-
- | );
+ $self->_add_css_js( 'css', $css );
}
sub add_js {
my ($self,$js) = @_;
- my ( $package, $path, $line ) = caller;
-
- if ( $js =~ m{http.*\.js} ) {
- $self->add_head( qq|
-
- |);
- } else {
- $self->add_head( qq|
-
- | );
- };
+ $self->_add_css_js( 'js', $js );
}
our $reload_counter = 0;