--- trunk/lib/Frey/Web.pm 2008/11/18 17:41:41 422
+++ trunk/lib/Frey/Web.pm 2008/11/19 03:11:11 446
@@ -1,8 +1,6 @@
package Frey::Web;
use Moose::Role;
-#with 'Frey::Escape';
-
use Frey::Types;
use Continuity::Widget::DomNode;
@@ -25,7 +23,7 @@
lazy => 1,
default => sub { [
{ 'Bookmarklets' => Frey::Bookmarklet->new->markup },
- { 'ClassBrowser' => Frey::ClassBrowser->new->markup },
+ { 'ClassBrowser' => Frey::ClassBrowser->new( usage_on_top => 0 )->markup },
] },
);
@@ -81,6 +79,8 @@
$out .= $self->_inline_path( $path ) ?
qq|| :
qq||;
+ } elsif ( $path =~ m{<.+>}s ) {
+ $out .= $path;
} else {
confess "don't know how to render $path";
}
@@ -95,6 +95,8 @@
my $size = $o->add_head( 'path/to/external.css' );
+ $o->add_head( '' );
+
=cut
sub add_head {
@@ -102,17 +104,19 @@
return if ! defined $path || $path eq '';
$path =~ s!^/!!;
- if ( -e $path ) {
+ if ( $path =~ m{<.*>}s ) {
+ push @{ $self->head }, $path;
+ } elsif ( -e $path ) {
if ( $path =~ m/\.(?:js|css)$/ ) {
push @{ $self->head }, $path;
} else {
confess "can't add_head( $path ) it's not js or css";
}
+ return -s $path;
} else {
confess "can't find $path: $!";
}
- return -s $path;
}
our $reload_counter = 0;
@@ -155,6 +159,9 @@
}
}
+ my $url = $self->request_url;
+ $url =~ s{\?reload=\d+}{};
+
my $html = join("\n",
qq||,
$self->_head_html,
@@ -166,7 +173,7 @@
qq|