--- trunk/lib/Frey/Web.pm	2008/12/14 22:15:51	838
+++ trunk/lib/Frey/Web.pm	2008/12/14 22:47:48	839
@@ -174,38 +174,48 @@
 
 }
 
-sub _add_something {
-	my ( $self, $regex, $tag, $type, $content ) = @_;
+sub _add_css_js {
+	my ( $self, $what, $content ) = @_;
 
-	my ( $package, $path, $line ) = caller(1);
+	my $tag  = $what eq 'css' ? 'style'    : 'script';
+	my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
+	my $head;
 
-	warn "# $regex $tag $type $content caller $package $path $line";
+	my ( $package, $path, $line ) = caller(1);
 
-	if ( $content =~ $regex ) {
+	if ( $content =~ m{\.(js|css)} ) {
 		$content = "/$content" if -e $content;
-		$self->add_head( strip ( qq|
-			<$tag type="$type"  src="$content">
-			/* via $package at $path line $line */
-			</$tag>
-		| ) );
+		if ( $what eq 'js' ) {
+			$head = qq|
+				<$tag type="$type" src="$content">
+				/* via $package at $path line $line */
+				</$tag>
+			|;
+		} else {
+			$head = qq|
+				<link rel="stylesheet" type="$type" href="$content">
+				<!-- via $package at $path line $line -->
+			|;
+		}
 	} else {
-		$self->add_head(qq|
+		$head = qq|
 			<$tag type="$type">
 			/* via $package at $path line $line */
 			$content
 			</$tag>
-		|);
+		|;
 	};
+	$self->add_head( $head );
 }
 
 sub add_css {
 	my ($self,$css) = @_;
-	$self->_add_something( qr{\.css$}, qw{style text/css}, $css );
+	$self->_add_css_js( 'css', $css );
 }
 
 sub add_js {
 	my ($self,$js) = @_;
-	$self->_add_something( qr{\.js$}, qw{script text/javascript}, $js );
+	$self->_add_css_js( 'js', $js );
 }
 
 our $reload_counter = 0;