Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/74664
Change subject: Tweak CSSJanus to support noflip for selectors with parentheses
......................................................................
Tweak CSSJanus to support noflip for selectors with parentheses
* Also suggested for CSSJanus itself here
code.google.com/p/cssjanus/issues/detail?id=22
Change-Id: I4e3b21522e9c5a72cd456ed3d6a0be9225e4b70d
---
M includes/libs/CSSJanus.php
M tests/phpunit/includes/libs/CSSJanusTest.php
2 files changed, 6 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/64/74664/1
diff --git a/includes/libs/CSSJanus.php b/includes/libs/CSSJanus.php
index f70e00a..128d9b9 100644
--- a/includes/libs/CSSJanus.php
+++ b/includes/libs/CSSJanus.php
@@ -99,7 +99,7 @@
$patterns['possibly_negative_quantity'] =
"((?:-?{$patterns['quantity']})|(?:inherit|auto))";
$patterns['color'] =
"(#?{$patterns['nmchar']}+|(?:rgba?|hsla?)\([ \d.,%-]+\))";
$patterns['url_chars'] =
"(?:{$patterns['url_special_chars']}|{$patterns['nonAscii']}|{$patterns['escape']})*";
- $patterns['lookahead_not_open_brace'] =
"(?!({$patterns['nmchar']}|\r?\n|\s|#|\:|\.|\,|\+|>)*?{)";
+ $patterns['lookahead_not_open_brace'] =
"(?!({$patterns['nmchar']}|\r?\n|\s|#|\:|\.|\,|\+|>|\(|\))*?{)";
$patterns['lookahead_not_closing_paren'] =
"(?!{$patterns['url_chars']}?{$patterns['valid_after_uri_chars']}\))";
$patterns['lookahead_for_closing_paren'] =
"(?={$patterns['url_chars']}?{$patterns['valid_after_uri_chars']}\))";
$patterns['noflip_single'] =
"/({$patterns['noflip_annotation']}{$patterns['lookahead_not_open_brace']}[^;}]+;?)/i";
diff --git a/tests/phpunit/includes/libs/CSSJanusTest.php
b/tests/phpunit/includes/libs/CSSJanusTest.php
index b51dbdf..820f965 100644
--- a/tests/phpunit/includes/libs/CSSJanusTest.php
+++ b/tests/phpunit/includes/libs/CSSJanusTest.php
@@ -394,6 +394,11 @@
'/* @noflip */ div { float: left; } .foo {
float: right; }'
),
array(
+ // support paranthesis on selector
+ '/* @noflip */ .test:not(:first) {
margin-right: -0.25em; margin-left: 0.25em; }',
+ '/* @noflip */ .test:not(:first) {
margin-right: -0.25em; margin-left: 0.25em; }'
+ ),
+ array(
// after multiple rules
'.foo { float: left; } /* @noflip */ div {
float: left; }',
'.foo { float: right; } /* @noflip */ div {
float: left; }'
--
To view, visit https://gerrit.wikimedia.org/r/74664
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e3b21522e9c5a72cd456ed3d6a0be9225e4b70d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ebrahim <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
