Merge pull request #8 from luislarrateguy/master

fixing issue with attributes that had spaces in their values
tj · Oct 20, 2014 · 8f7c606 · 8f7c606
2 parents fa8b0d1 + 85a14bd
commit 8f7c606
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/selector.inc b/selector.inc
@@ -89,8 +89,8 @@ function selector_to_xpath($selector) {
   $selector = preg_replace('/\s*~\s*/', '~', $selector);
   $selector = preg_replace('/\s*\+\s*/', '+', $selector);
   $selector = preg_replace('/\s*,\s*/', ',', $selector);
-  $selectors = preg_split("/\s+/", $selector);
- 
+  $selectors = preg_split("/\s+(?![^\[]+\])/", $selector);
+
   foreach ($selectors as &$selector) {
   	// ,
   	$selector = preg_replace('/\s*,\s*/', '|descendant-or-self::', $selector);

diff --git a/test.selector.php b/test.selector.php
@@ -28,6 +28,8 @@ function test($selector, $expected) {
 test('[id]',                'descendant-or-self::*[@id]');
 test('[id=bar]',            'descendant-or-self::*[@id="bar"]');
 test('foo[id=bar]',         'descendant-or-self::foo[@id="bar"]');
+test('[style=color: red; border: 1px solid black;]',            'descendant-or-self::*[@style="color: red; border: 1px solid black;"]');
+test('foo[style=color: red; border: 1px solid black;]',         'descendant-or-self::foo[@style="color: red; border: 1px solid black;"]');
 test(':button',             'descendant-or-self::input[@type="button"]');
 test('textarea',            'descendant-or-self::textarea');
 test(':submit',             'descendant-or-self::input[@type="submit"]');