Css vom Menü nicht nachträglich laden, sondern schon im Layout laden.

[mfinanz.git] / SL / Layout / Base.pm

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 56d5b8e2fc94923c666851fac602db63d504998a..18ef133e920b2e23cd92c8ea67c28914fa4ab4d4 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -3,6 +3,8 @@ package SL::Layout::Base;
 use strict;
 use parent qw(SL::Controller::Base);
 
+use List::MoreUtils qw(uniq);
+
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => qw(menu),
   'scalar'                => qw(focus),
@@ -49,12 +51,12 @@ sub post_content {
 }
 
 sub stylesheets_inline {
-  ( map { $_->stylesheets_inline } $_[0]->sub_layouts ),
+  uniq ( map { $_->stylesheets_inline } $_[0]->sub_layouts ),
   @{ $_[0]->{stylesheets_inline} || [] };
 }
 
 sub javascripts_inline {
-  ( map { $_->javascripts_inline } $_[0]->sub_layouts ),
+  uniq ( map { $_->javascripts_inline } $_[0]->sub_layouts ),
   @{ $_[0]->{javascripts_inline} || [] };
 }
 
@@ -63,6 +65,10 @@ sub javascripts_inline {
 # Interface
 ########################################
 
+sub add_stylesheets {
+  &use_stylesheet;
+}
+
 sub use_stylesheet {
   my $self = shift;
   push @{ $self->{stylesheets} ||= [] }, @_ if @_;
@@ -73,7 +79,7 @@ sub stylesheets {
   my ($self) = @_;
   my $css_path = $self->get_stylesheet_for_user;
 
-  return grep { $_ } map { $self->_find_stylesheet($_, $css_path)  }
+  return uniq grep { $_ } map { $self->_find_stylesheet($_, $css_path)  }
     $self->use_stylesheet, map { $_->stylesheets } $self->sub_layouts;
 }
 
@@ -103,6 +109,9 @@ sub get_stylesheet_for_user {
   return $css_path;
 }
 
+sub add_javascripts {
+  &use_javascript
+}
 
 sub use_javascript {
   my $self = shift;
@@ -113,7 +122,7 @@ sub use_javascript {
 sub javascripts {
   my ($self) = @_;
 
-  return map { $self->_find_javascript($_)  }
+  return uniq map { $self->_find_javascript($_)  }
     $self->use_javascript, map { $_->javascripts } $self->sub_layouts;
 }