@@ -4,6 +4,7 @@ name 'IWL'; all_from 'lib/IWL.pm'; license 'perl'; +requires 'Locale::Messages'; requires 'Locale::TextDomain' => 1.10; requires 'File::ShareDir' => 0.05; requires 'HTML::Parser' => 2.25; Makefile.PL @@ -1750,11 +1750,17 @@ sub __addRequired { $top->{___lastShared} = $scripts[-1]; - $script && $script->{parentNode} - ? $script->{parentNode}->insertBefore($script, @scripts) - : $pivot && $pivot->{parentNode} - ? $pivot->{parentNode}->insertAfter($pivot, @scripts) - : ($body || $self)->appendChild(@scripts); + if ($script && $script->{parentNode}) { + $script->{parentNode}->insertBefore($script, @scripts); + } elsif ($pivot && $pivot->{parentNode}) { + if ($self != $top) { + my $last = $pivot->next({package => 'IWL::Script'}, {attribute => ['iwl:requiredScript']}); + $pivot = $last if $last; + } + $pivot->{parentNode}->insertAfter($pivot, @scripts); + } else { + ($body || $self)->appendChild(@scripts); + } if (ref $required{css} eq 'ARRAY') { if ($head) { lib/IWL/Object.pm @@ -1,4 +1,4 @@ -use Test::More tests => 126; +use Test::More tests => 128; use IWL::Object; use IWL::Config '%IWLConfig'; @@ -155,8 +155,10 @@ my $output; $o2 = IWL::Test::Object2->new; $o->appendChild($o2); $data = $o->getObject; - is($data->{children}[0]{children}[0]{children}[0]{text}, qq(\@import "/my/skin/darkness/foo.css";\n)); - is($data->{children}[1]{attributes}{src}, '/jscript/foo.js'); + is($data->{children}[0]{children}[0]{text}, qq(\@import "/my/skin/darkness/foo.css";\n)); + is($data->{children}[1]{children}[0]{children}[0]{text}, qq(\@import "/my/skin/darkness/bar.css";\n)); + is($data->{children}[2]{attributes}{src}, '/jscript/foo.js'); + is($data->{children}[3]{attributes}{src}, '/jscript/bar.js'); } { @@ -268,8 +270,15 @@ package IWL::Test::Object2; use base 'IWL::Object'; +sub new { + my $self = shift->SUPER::new; + + $self->require(js => 'foo.js', css => 'foo.css'); + return $self; +} + sub _realize { my $self = shift; - $self->require(js => 'foo.js', css => 'foo.css'); + $self->require(js => 'bar.js', css => 'bar.css'); $self->SUPER::_realize; } t/10object.t 4e29e6a02d900fdcc2240e2cc77fae7b529d491d urandom vkojouharov@gmail.com http://github.com/urandom/iwl/commit/d4d5b4972002d577303a651ce2c3e62e0bef373c d4d5b4972002d577303a651ce2c3e62e0bef373c 2008-11-11T10:22:36-08:00 2008-11-11T10:22:36-08:00 make sure the required scripts inside the child's realize method are placed in the correct order 98eb05cc81f9ee1be837dfb6ed51b13dc61467b3 urandom vkojouharov@gmail.com