moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-45545-26' of git://github.com/FMCorz/moodle into MOODLE_26_STABLE

Browse source
This commit is contained in:
Dan Poltawski 2014-05-20 12:21:58 +08:00
commit 67f6ebacff
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/csslib.php
View file

@ -203,9 +203,9 @@ function css_chunk_by_selector_count($css, $importurl, $maxselectors = 4095, $bu
}
}
// Let's count the number of selectors, but only if we are not in a rule as they
// can contain commas too.
if (!$inrule && $char === ',') {
// Let's count the number of selectors, but only if we are not in a rule, or in
// the definition of a media query, as they can contain commas too.
if (!$mediacoming && !$inrule && $char === ',') {
$selectorcount++;
}

6
lib/tests/csslib_test.php
View file

@ -1176,6 +1176,12 @@ CSS;
$this->assertCount(1, $chunks);
$this->assertSame('@media (min-width: 980px) { .a,.b{} }', $chunks[0]);
// Test media queries, with commas.
$css = '.a{} @media (min-width: 700px), handheld and (orientation: landscape) { .b{} }';
$chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);
$this->assertCount(1, $chunks);
$this->assertSame($css, $chunks[0]);
// Test special rules.
$css = 'a,b{ background-image: linear-gradient(to bottom, #ffffff, #cccccc);}d,e{}';
$chunks = css_chunk_by_selector_count($css, 'styles.php?type=test', 2);