Skip to content

deal with duplicate media queries, fixes #46 #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
peterbe merged 2 commits into from
Jul 10, 2017
Merged

deal with duplicate media queries, fixes #46 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c72bdf
deal with duplicate media queries, fixes #46
peterbe Jul 10, 2017
72e0e5e
bump to version 0.11.3
peterbe Jul 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mincss/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.11.2'
__version__ = '0.11.3'
2 changes: 1 addition & 1 deletion mincss/processor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ def commentmatcher(match):

for temp_key, old, __ in inner_improvements:
assert old in content, old
content = content.replace(old, temp_key)
content = content.replace(old, temp_key, 1)

_regex = re.compile('((.*?){(.*?)})', re.DOTALL | re.M)

Expand Down
12 changes: 12 additions & 0 deletions tests/duplicate-media-queries.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html>
<head>
<style>
@media screen and (min-width: 600px) { p { display: none; } }
@media screen and (min-width: 600px) { p { display: none; } }
</style>
</head>
<body>
<p>Hello world</p>
</body>
</html>
13 changes: 13 additions & 0 deletions tests/test_mincss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,3 +355,16 @@ def test_before_after(self):
after = p.inlines[0].after
ok_('ul li:after { content: "x"; }' not in after)
ok_('ol li:before { content: "x"; }' in after)

def test_duplicate_media_queries(self):
"""if two media queries look exactly the same, it shouldn't fail.

This is kinda hackish but it desperately tries to solve
https://github.com/peterbe/mincss/issues/46
"""
html = os.path.join(HERE, 'duplicate-media-queries.html')
url = 'file://' + html
p = Processor()
p.process(url)
snippet = '@media screen and (min-width: 600px) {'
eq_(p.inlines[0].after.count(snippet), 2)