fixed bug in Mojo::DOM::CSS where the :empty pseudo class would not i…

…gnore comments and processing instructions
mojolicious · Nov 25, 2014 · 1d89d3c · 1d89d3c
1 parent 190153f
commit 1d89d3c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,5 +1,7 @@
 
 5.66  2014-11-25
+  - Fixed bug in Mojo::DOM::CSS where the :empty pseudo class would not ignore
+    comments and processing instructions.
 
 5.65  2014-11-24
   - Improved installable scripts to use #!perl. (jberger)

diff --git a/lib/Mojo/DOM/CSS.pm b/lib/Mojo/DOM/CSS.pm
@@ -125,6 +125,8 @@ sub _compile {
   return $pattern;
 }
 
+sub _empty { $_[0][0] eq 'comment' || $_[0][0] eq 'pi' }
+
 sub _equation {
   my $equation = shift;
 
@@ -161,7 +163,7 @@ sub _pc {
   my ($class, $args, $current) = @_;
 
   # ":empty"
-  return !defined $current->[4] if $class eq 'empty';
+  return !grep { !_empty($_) } @$current[4 .. $#$current] if $class eq 'empty';
 
   # ":root"
   return $current->[3] && $current->[3][0] eq 'root' if $class eq 'root';

diff --git a/t/mojo/dom.t b/t/mojo/dom.t
@@ -826,6 +826,8 @@ $dom = Mojo::DOM->new->parse(<<EOF);
     </select>
     <input type="submit" value="Ok!" />
     <input type="checkbox" checked name="I">
+    <p id="content">test 123</p>
+    <p id="no_content"><? test ?><!-- 123 --></p>
 </form>
 EOF
 is $dom->find(':root')->[0]->type,     'form', 'right type';
@@ -854,7 +856,9 @@ is $dom->at('optgroup > *:checked[value="e"]')->text,    'E', 'right text';
 is $dom->find(':checked[value="e"]')->[1], undef, 'no result';
 is $dom->find(':empty')->[0]->attr->{name},      'user', 'right name';
 is $dom->find('input:empty')->[0]->attr->{name}, 'user', 'right name';
-is $dom->at(':empty[type^="ch"]')->attr->{name}, 'groovy', 'right name';
+is $dom->at(':empty[type^="ch"]')->attr->{name}, 'groovy',  'right name';
+is $dom->at('p')->attr->{id},                    'content', 'right attribute';
+is $dom->at('p:empty')->attr->{id}, 'no_content', 'right attribute';
 
 # More pseudo classes
 $dom = Mojo::DOM->new->parse(<<EOF);