--- trunk/lib/Frey/Web.pm 2009/01/05 20:31:14 922
+++ trunk/lib/Frey/Web.pm 2009/01/06 16:05:05 949
@@ -80,6 +80,14 @@
return $html;
}
+# from Mojo::ByteStream
+sub url_escape {
+ my ( $self, $url, $pattern ) = @_;
+ $pattern ||= 'A-Za-z0-9\-\.\_\~';
+ $url =~ s/([^$pattern])/sprintf('%%%02X',ord($1))/ge;
+ return $url;
+}
+
sub html_dump {
my ( $self, $dump ) = @_;
$dump = dump( $dump ) if ref($dump);
@@ -193,7 +201,7 @@
$content
|;
- } elsif ( $content =~ m{^(/|https?://)} ) {
+ } elsif ( $content =~ m{^(/\w+|https?://)} && $content !~ m{[\n\r]} ) {
if ( $what eq 'js' ) {
$head = qq|
<$tag type="$type" src="$content">
@@ -297,10 +305,18 @@
$self->add_icon unless $icon_html;
+ my $title = undef
+ || $a->{title}
+ || $self->title
+ || ref($self)
+ ;
+
+# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+
my $html = join("\n",
qq||,
$self->_head_html,
- '' . ( $self->title || $a->{title} || ref($self) ) . '',
+ qq|$title|,
'',
( $icon_html || '' ),
( $a->{head} || '' ),
@@ -431,8 +447,8 @@
sub add_status {
my ( $self, $data ) = @_;
- push @status, { 'X' => [ $self->backtrace ] };
- if ( ref($data) ) {
+ die "no data" unless $data;
+ if ( ref $data ) {
push @status, $data;
} else {
if ( defined $status[ $#status ] ) {