render HTML with a little less code

mojolicious · Jan 19, 2015 · d9ddec2 · d9ddec2
1 parent fb39827
commit d9ddec2
Showing 1 changed file with 17 additions and 30 deletions.
diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -217,43 +217,30 @@ sub _render {
   # Processing instruction
   return '<?' . $tree->[1] . '?>' if $type eq 'pi';
 
-  # Start tag
-  my $result = '';
-  if ($type eq 'tag') {
-
-    # Open tag
-    my $tag = $tree->[1];
-    $result .= "<$tag";
-
-    # Attributes
-    my @attrs;
-    for my $key (sort keys %{$tree->[2]}) {
+  # Root
+  return join '', map { _render($_, $xml) } @$tree[1 .. $#$tree]
+    if $type eq 'root';
 
-      # No value
-      push @attrs, $key and next unless defined(my $value = $tree->[2]{$key});
-
-      # Key and value
-      push @attrs, $key . '="' . xml_escape($value) . '"';
-    }
-    $result .= join ' ', '', @attrs if @attrs;
-
-    # Element without end tag
-    return $xml ? "$result />" : $EMPTY{$tag} ? "$result>" : "$result></$tag>"
-      unless $tree->[4];
+  # Start tag
+  my $tag    = $tree->[1];
+  my $result = "<$tag";
 
-    # Close tag
-    $result .= '>';
+  # Attributes
+  for my $key (sort keys %{$tree->[2]}) {
+    $result .= " $key" and next unless defined(my $value = $tree->[2]{$key});
+    $result .= " $key" . '="' . xml_escape($value) . '"';
   }
 
-  # Render whole tree
+  # No children
+  return $xml ? "$result />" : $EMPTY{$tag} ? "$result>" : "$result></$tag>"
+    unless $tree->[4];
+
+  # Children
   no warnings 'recursion';
-  $result .= _render($tree->[$_], $xml)
-    for ($type eq 'root' ? 1 : 4) .. $#$tree;
+  $result .= '>' . join '', map { _render($_, $xml) } @$tree[4 .. $#$tree];
 
   # End tag
-  $result .= '</' . $tree->[1] . '>' if $type eq 'tag';
-
-  return $result;
+  return "$result</$tag>";
 }
 
 sub _start {