From: jenkins-bot Date: Fri, 27 Sep 2013 20:35:16 +0000 (+0000) Subject: Merge "CSSJanus: Support text-shadow and box-shadow flipping" X-Git-Tag: 1.31.0-rc.0~18666 X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=edba2e008c079f4d51abc70f2c98c1dc8009a900;hp=-c;p=lhc%2Fweb%2Fwiklou.git Merge "CSSJanus: Support text-shadow and box-shadow flipping" --- edba2e008c079f4d51abc70f2c98c1dc8009a900 diff --combined includes/libs/CSSJanus.php index 128d9b9031,259c9ffc6f..5a52fc7c27 --- a/includes/libs/CSSJanus.php +++ b/includes/libs/CSSJanus.php @@@ -77,6 -77,9 +77,9 @@@ class CSSJanus 'four_notation_quantity' => null, 'four_notation_color' => null, 'border_radius' => null, + 'box_shadow' => null, + 'text_shadow1' => null, + 'text_shadow2' => null, 'bg_horizontal_percentage' => null, 'bg_horizontal_percentage_x' => null, ); @@@ -99,7 -102,7 +102,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"; @@@ -117,6 -120,9 +120,9 @@@ $patterns['four_notation_quantity'] = "/(:\s*){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s*[;}])/i"; $patterns['four_notation_color'] = "/(-color\s*:\s*){$patterns['color']}(\s+){$patterns['color']}(\s+){$patterns['color']}(\s+){$patterns['color']}(\s*[;}])/i"; $patterns['border_radius'] = "/(border-radius\s*:\s*){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s+){$patterns['possibly_negative_quantity']}(\s*[;}])/i"; + $patterns['box_shadow'] = "/(box-shadow\s*:\s*(?:inset\s*)?){$patterns['possibly_negative_quantity']}/i"; + $patterns['text_shadow1'] = "/(text-shadow\s*:\s*){$patterns['color']}(\s*){$patterns['possibly_negative_quantity']}/i"; + $patterns['text_shadow2'] = "/(text-shadow\s*:\s*){$patterns['possibly_negative_quantity']}/i"; // The two regexes below are parenthesized differently then in the original implementation to make the // callback's job more straightforward $patterns['bg_horizontal_percentage'] = "/(background(?:-position)?\s*:\s*[^%]*?)(-?{$patterns['num']})(%\s*(?:{$patterns['quantity']}|{$patterns['ident']}))/"; @@@ -164,6 -170,7 +170,7 @@@ $css = self::fixFourPartNotation( $css ); $css = self::fixBorderRadius( $css ); $css = self::fixBackgroundPosition( $css ); + $css = self::fixShadows( $css ); // Detokenize stuff we tokenized before $css = $comments->detokenize( $css ); @@@ -262,7 -269,6 +269,6 @@@ private static function fixFourPartNotation( $css ) { $css = preg_replace( self::$patterns['four_notation_quantity'], '$1$2$3$8$5$6$7$4$9', $css ); $css = preg_replace( self::$patterns['four_notation_color'], '$1$2$3$8$5$6$7$4$9', $css ); - return $css; } @@@ -282,6 -288,41 +288,41 @@@ return $css; } + /** + * Negates horizontal offset in box-shadow and text-shadow rules. + * + * @param $css string + * @return string + */ + private static function fixShadows( $css ) { + // Flips the sign of a CSS value, possibly with a unit. + // (We can't just negate the value with unary minus due to the units.) + $flipSign = function ( $cssValue ) { + // Don't mangle zeroes + if ( intval( $cssValue ) === 0 ) { + return $cssValue; + } elseif ( $cssValue[0] === '-' ) { + return substr( $cssValue, 1 ); + } else { + return "-" . $cssValue; + } + }; + + $css = preg_replace_callback( self::$patterns['box_shadow'], function ( $matches ) use ( $flipSign ) { + return $matches[1] . $flipSign( $matches[2] ); + }, $css ); + + $css = preg_replace_callback( self::$patterns['text_shadow1'], function ( $matches ) use ( $flipSign ) { + return $matches[1] . $matches[2] . $matches[3] . $flipSign( $matches[4] ); + }, $css ); + + $css = preg_replace_callback( self::$patterns['text_shadow2'], function ( $matches ) use ( $flipSign ) { + return $matches[1] . $flipSign( $matches[2] ); + }, $css ); + + return $css; + } + /** * Flip horizontal background percentages. * @param $css string diff --combined tests/phpunit/includes/libs/CSSJanusTest.php index d80a571c07,6d158307f3..1c898f021c --- a/tests/phpunit/includes/libs/CSSJanusTest.php +++ b/tests/phpunit/includes/libs/CSSJanusTest.php @@@ -196,6 -196,28 +196,28 @@@ class CSSJanusTest extends MediaWikiTes '.foo { padding: 1px; }' ), + // text-shadow and box-shadow + array( + '.foo { box-shadow: -6px 3px 8px 5px rgba(0, 0, 0, 0.25); }', + '.foo { box-shadow: 6px 3px 8px 5px rgba(0, 0, 0, 0.25); }', + ), + array( + '.foo { box-shadow: inset -6px 3px 8px 5px rgba(0, 0, 0, 0.25); }', + '.foo { box-shadow: inset 6px 3px 8px 5px rgba(0, 0, 0, 0.25); }', + ), + array( + '.foo { text-shadow: orange 2px 0; }', + '.foo { text-shadow: orange -2px 0; }', + ), + array( + '.foo { text-shadow: 2px 0 orange; }', + '.foo { text-shadow: -2px 0 orange; }', + ), + array( + // Don't mangle zeroes + '.foo { text-shadow: orange 0 2px; }' + ), + // Direction // Note: This differs from the Python implementation, // see also CSSJanus::fixDirection for more info. @@@ -393,11 -415,6 +415,11 @@@ '/* @noflip */ div { float: left; } .foo { float: left; }', '/* @noflip */ div { float: left; } .foo { float: right; }' ), + array( + // support parentheses in 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; }',