--- trunk/lib/Frey/Web.pm 2008/12/10 18:47:14 796
+++ trunk/lib/Frey/Web.pm 2008/12/12 18:01:02 819
@@ -3,12 +3,15 @@
with 'Frey::Session';
-use Frey::Types;
-
#use Continuity::Widget::DomNode;
use Data::Dump qw/dump/;
use Carp qw/confess cluck carp/;
use File::Slurp;
+use Text::Tabs; # expand, unexpand
+
+use lib 'lib';
+
+use Frey::Types;
use Frey::Bookmarklet;
use Frey::Class::Browser;
@@ -16,8 +19,6 @@
use Frey::SVK;
-use Text::Tabs; # expand, unexpand
-
our @head;
sub head { @head }
@@ -185,14 +186,23 @@
}
sub add_js {
- my ($self,$css) = @_;
+ my ($self,$js) = @_;
my ( $package, $path, $line ) = caller;
- $self->add_head( qq|
-
- | );
+
+ if ( $js =~ m{http.*\.js} ) {
+ $self->add_head( qq|
+
+ |);
+ } else {
+ $self->add_head( qq|
+
+ | );
+ };
}
our $reload_counter = 0;
@@ -456,18 +466,32 @@
sub icon_path {
my ($self,$class,$variant) = @_;
- my $icon = $class;
- $icon ||= $self->title;
- $icon =~ s{::}{/}g;
- $icon .= "/$variant" if $variant;
- my $path = 'static/icons/' . $icon . '.png';
- if ( -e $path ) {
- warn "# $class from $self icon_path $path" if $self->debug;
- return $path;
- } else {
- $self->TODO( "add $path icon for $class" );
+# $class ||= $self->title;
+
+ sub icon_exists {
+ my $class = shift;
+ $class =~ s{::}{/}g;
+ $class .= "/$variant" if $variant;
+ my $icon_path = 'static/icons/' . $class . '.png';
+ return $icon_path if -e $icon_path;
+ return;
+ }
+
+ my $path = icon_exists( $class );
+ if ( ! $path ) {
+ my $super_class = $class;
+ while ( $super_class =~ s{::[^:]+$}{} && ! $path ) {
+ $path = icon_exists( $super_class ) unless $super_class eq 'Frey'; # don't default on Frey icon
+ }
+ }
+
+ if ( ! $path ) {
+ $self->TODO( "add icon for $class" . ( $variant ? " variant $variant" : '' ) );
return undef;
}
+
+ warn "# $class from $self icon_path $path" if $self->debug;
+ return $path;
}
sub add_icon {