--- trunk/lib/Frey/Web.pm	2008/12/14 15:13:55	837
+++ trunk/lib/Frey/Web.pm	2008/12/14 22:15:51	838
@@ -174,37 +174,40 @@
 
 }
 
-sub add_css {
-	my ($self,$css) = @_;
-	my ( $package, $path, $line ) = caller;
-	$self->add_head( qq|
-	<style type="text/css">
-	/* via $package at $path line $line */
-	$css
-	</style>
-	| );
-}
+sub _add_something {
+	my ( $self, $regex, $tag, $type, $content ) = @_;
 
-sub add_js {
-	my ($self,$js) = @_;
-	my ( $package, $path, $line ) = caller;
+	my ( $package, $path, $line ) = caller(1);
+
+	warn "# $regex $tag $type $content caller $package $path $line";
 
-	if ( $js =~ m{http.*\.js} ) {
-		$self->add_head( qq|
-			<script type="text/javascript" src="$js">
+	if ( $content =~ $regex ) {
+		$content = "/$content" if -e $content;
+		$self->add_head( strip ( qq|
+			<$tag type="$type"  src="$content">
 			/* via $package at $path line $line */
-			</script>
-		|);
+			</$tag>
+		| ) );
 	} else {
-		$self->add_head( qq|
-			<script type="text/javascript">
+		$self->add_head(qq|
+			<$tag type="$type">
 			/* via $package at $path line $line */
-			$js
-			</script>
-		| );
+			$content
+			</$tag>
+		|);
 	};
 }
 
+sub add_css {
+	my ($self,$css) = @_;
+	$self->_add_something( qr{\.css$}, qw{style text/css}, $css );
+}
+
+sub add_js {
+	my ($self,$js) = @_;
+	$self->_add_something( qr{\.js$}, qw{script text/javascript}, $js );
+}
+
 our $reload_counter = 0;