a few small formatting fixes

mojolicious · Oct 14, 2014 · b46894b · b46894b
1 parent 9d06a53
commit b46894b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,6 @@
 
-5.50  2014-10-11
+5.50  2014-10-14
+  - Fixed description list parsing bug in Mojo::DOM::HTML. (Trelane)
 
 5.49  2014-10-10
   - Improved form content generator to allow custom content types.

diff --git a/lib/Mojo/DOM/HTML.pm b/lib/Mojo/DOM/HTML.pm
@@ -54,11 +54,7 @@ my %RAW = map { $_ => 1 } qw(script style);
 my %RCDATA = map { $_ => 1 } qw(title textarea);
 
 # HTML elements with optional end tags
-my %END = (
-  body => ['head'],
-  rp   => [qw(rt rp)],
-  rt   => [qw(rt rp)]
-);
+my %END = (body => ['head'], rp => [qw(rt rp)], rt => [qw(rt rp)]);
 $END{$_} = [$_] for qw(optgroup option);
 
 # HTML elements that break paragraphs

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -895,6 +895,8 @@ Magnus Holm
 
 Maik Fischer
 
+Mark Fowler
+
 Mark Grimes
 
 Mark Stosberg

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -1311,22 +1311,6 @@ is $dom->find('dl > dd')->[1]->text, 'D', 'right text';
 is $dom->find('dl > dt')->[2]->text, 'E', 'right text';
 is $dom->find('dl > dd')->[2]->text, 'F', 'right text';
 
-# but different levels don't self-terminate to allow for nesting
-$dom = Mojo::DOM->new->parse(<<EOF);
-<dl>
-  <dt>A</dt>
-  <DD>
-    <dl>
-      <dt>B</dt>
-      <dd>C</dd>
-    </dl>
-  </dd>
-</dl>
-EOF
-is $dom->find('dl > dd > dl > dt')->[0]->text, 'B', 'right text';
-is $dom->find('dl > dd > dl > dd')->[0]->text, 'C', 'right text';
-is $dom->find('dl > dt')->[0]->text,           'A', 'right text';
-
 # Optional "rp" and "rt" tags
 $dom = Mojo::DOM->new->parse(<<EOF);
 <ruby>
@@ -2297,6 +2281,22 @@ is "$dom", <<EOF, 'right result';
 <bar>after</bar>
 EOF
 
+# Nested description lists
+$dom = Mojo::DOM->new->parse(<<EOF);
+<dl>
+  <dt>A</dt>
+  <DD>
+    <dl>
+      <dt>B
+      <dd>C
+    </dl>
+  </dd>
+</dl>
+EOF
+is $dom->find('dl > dd > dl > dt')->[0]->text, 'B', 'right text';
+is $dom->find('dl > dd > dl > dd')->[0]->text, 'C', 'right text';
+is $dom->find('dl > dt')->[0]->text,           'A', 'right text';
+
 # Nested lists
 $dom = Mojo::DOM->new(<<EOF);
 <div>