filter nodes earlier

mojolicious · Dec 10, 2014 · bd8bb40 · bd8bb40
1 parent 5a763de
commit bd8bb40
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/lib/Mojo/DOM.pm b/lib/Mojo/DOM.pm
@@ -10,7 +10,6 @@ use overload
 # "Fry: This snow is beautiful. I'm glad global warming never happened.
 #  Leela: Actually, it did. But thank God nuclear winter canceled it out."
 use Carp 'croak';
-use List::Util 'first';
 use Mojo::Collection;
 use Mojo::DOM::CSS;
 use Mojo::DOM::HTML;
@@ -68,11 +67,7 @@ sub attr {
   return $self;
 }
 
-sub children {
-  my $self = shift;
-  return _select(
-    $self->_collect(grep { $_->[0] eq 'tag' } _nodes($self->tree)), @_);
-}
+sub children { _select($_[0]->_collect(_nodes($_[0]->tree, 1)), $_[1]) }
 
 sub content {
   my $self = shift;
@@ -308,7 +303,8 @@ sub _maybe { $_[1] ? _build($_[0], $_[1], $_[0]->xml) : undef }
 
 sub _nodes {
   return unless my $tree = shift;
-  return @$tree[_start($tree) .. $#$tree];
+  my @nodes = @$tree[_start($tree) .. $#$tree];
+  return shift() ? grep { $_->[0] eq 'tag' } @nodes : @nodes;
 }
 
 sub _offset {
@@ -398,7 +394,7 @@ sub _wrap {
   # Find innermost tag
   my $current;
   my $first = $new = $self->_parse($new);
-  $current = $first while $first = first { $_->[0] eq 'tag' } _nodes($first);
+  $current = $first while $first = (_nodes($first, 1))[0];
   return $self unless $current;
 
   # Wrap content

diff --git a/lib/Mojo/IOLoop/Server.pm b/lib/Mojo/IOLoop/Server.pm
@@ -100,7 +100,7 @@ sub listen {
   $tls->{SSL_cipher_list} = $args->{tls_ciphers} if $args->{tls_ciphers};
 }
 
-sub port { shift->handle->sockport }
+sub port { shift->{handle}->sockport }
 
 sub start {
   my $self = shift;
@@ -308,7 +308,7 @@ TLS verification mode, defaults to C<0x03>.
 
   my $port = $server->port;
 
-Get TCP port this server is listening on.
+Get port this server is listening on.
 
 =head2 start