Präzedenz von Layouts beim Javascript einbinden geändert

- früher eingebunden = javascripte werden früher geladen.
- None ist jetzt das erste Layout das eingebunden wird.

diff --git a/SL/Layout/Base.pm b/SL/Layout/Base.pm
index 83f8ff5ef03fc15c3a5b7281348b3fe2b4bd1b18..cd5ace9391fc43637f8b6c121da187643954e115 100644 (file)
--- a/SL/Layout/Base.pm
+++ b/SL/Layout/Base.pm
@@ -125,7 +125,7 @@ sub javascripts {
   my ($self) = @_;
 
   return uniq map { $self->_find_javascript($_)  }
   my ($self) = @_;
 
   return uniq map { $self->_find_javascript($_)  }

-    $self->use_javascript, map { $_->javascripts } $self->sub_layouts;
+    map({ $_->javascripts } $self->sub_layouts), $self->use_javascript;

 }
 
 sub _find_javascript {
 }
 
 sub _find_javascript {

diff --git a/SL/Layout/Classic.pm b/SL/Layout/Classic.pm
index 9503d05fe24c94bfe0a19c19f0a678103171c800..94f12b3d6c55041b0c98b7b0849f384764f27d4f 100644 (file)
--- a/SL/Layout/Classic.pm
+++ b/SL/Layout/Classic.pm
@@ -9,9 +9,9 @@ use SL::Layout::None;
 
 sub init_sub_layouts {
   [
 
 sub init_sub_layouts {
   [

+    SL::Layout::None->new,

     SL::Layout::Top->new,
     SL::Layout::MenuLeft->new,
     SL::Layout::Top->new,
     SL::Layout::MenuLeft->new,

-    SL::Layout::None->new,

   ]
 }
 
   ]
 }