--- trunk/lib/Frey/Web.pm 2009/01/06 15:26:19 945
+++ trunk/lib/Frey/Web.pm 2009/04/27 18:43:18 1065
@@ -3,11 +3,11 @@
with 'Frey::Session';
-#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess cluck carp/;
use File::Slurp;
use Text::Tabs; # expand, unexpand
+use Digest::MD5 qw/md5/;
use lib 'lib';
@@ -71,11 +71,19 @@
default => 250,
);
+has 'wrap_in_page' => (
+ documentation => 'wrap full html page with status bar around content',
+ is => 'rw',
+ isa => 'Bool',
+ default => 1,
+);
+
my %escape = ('<'=>'<', '>'=>'>', '&'=>'&', '"'=>'"');
my $escape_re = join '|' => keys %escape;
sub html_escape {
my ( $self, $html ) = @_;
+ return '' unless defined $html;
$html =~ s/($escape_re)/$escape{$1}/g;
return $html;
}
@@ -189,6 +197,9 @@
sub _add_css_js {
my ( $self, $what, $content ) = @_;
+ my $md5 = md5( $content );
+ return if $self->{_add_css_js_seen}->{$what}->{$md5}++;
+
my $tag = $what eq 'css' ? 'style' : 'script';
my $type = $what eq 'css' ? 'text/css' : 'text/javascript';
my $head;
@@ -196,12 +207,12 @@
my ( $package, $path, $line ) = caller(1);
$content = "/$content" if $content !~ m{[\n\r]} && -e $content;
- if ( $content =~ $re_html ) {
+ if ( $content =~ $re_html && $what ne 'js' ) {
$head = qq|
$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">
@@ -238,9 +249,9 @@
our $reload_counter = 0;
-=head2 page
+=head2 html_page
- $self->page(
+ $self->html_page(
title => 'page title',
head => '',
body => 'Page Body',
@@ -253,7 +264,7 @@
our $icon_html;
-sub page {
+sub html_page {
my $self = shift;
my $a = {@_};
@@ -276,7 +287,7 @@
warn "# no body, invoke $self->$run on ", ref($self);
$body = $self->$run;
}
- if ( $self->content_type !~ m{html} ) {
+ if ( $self->content_type !~ m{html} || ! $self->wrap_in_page ) {
warn "# return only $self body ", $self->content_type;
return $body
} elsif ( ! defined $body ) {
@@ -292,7 +303,7 @@
my $right =
qq|
-
+
reload
$exit
@@ -313,6 +324,12 @@
# $title =~ s{(\w)\w+::}{$1:}g; # XXX compress names of classes
+ $self->add_css(qq|
+ body {
+ padding-bottom: 3em; /* don't overlap status line */
+ }
+ |);
+
my $html = join("\n",
qq||,
$self->_head_html,