--- trunk/lib/Frey/Web.pm	2008/12/16 14:10:09	857
+++ trunk/lib/Frey/Web.pm	2008/12/16 14:26:23	859
@@ -94,7 +94,7 @@
 sub popup    { my $self = shift; $self->popup_dropdown('popup',    @_); }
 sub dropdown { my $self = shift; $self->popup_dropdown('dropdown', @_); }
 
-our $re_html = qr{<(?:!--.+?--|(\w+).+?/\1|[^>]+/?)>}s; # relaxed html check for one semi-valid tag
+our $re_html = qr{<(?:!--|(\w+)|[^>]+)/?>}s; # relaxed html check for one semi-valid tag
 
 sub popup_dropdown {
 	my ( $self, $type, $name, $content, $full ) = @_;
@@ -186,16 +186,21 @@
 
 	if ( $content =~ m{\.(js|css)} ) {
 		$content = "/$content" if -e $content;
-		if ( $what eq 'js' ) {
+		if ( $content =~ $re_html ) {
+			$head = qq|
+				$content
+				<!-- $type via $package at $path line $line -->
+			|;
+		} elsif ( $what eq 'js' ) {
 			$head = qq|
 				<$tag type="$type" src="$content">
-				/* via $package at $path line $line */
+				/* $what via $package at $path line $line */
 				</$tag>
 			|;
 		} else {
 			$head = qq|
 				<link rel="stylesheet" type="$type" href="$content">
-				<!-- via $package at $path line $line -->
+				<!-- $what via $package at $path line $line -->
 			|;
 		}
 	} else {