Merge pull request #1245 from xzyfer/fix/incorrectly-merged-media-queries

xzyfer · xzyfer · commit 38a4ba22bb18 · 2015-05-27T19:14:07.000-07:00
Don't output nested media queries that cannot be merged
diff --git a/cssize.cpp b/cssize.cpp
@@ -423,8 +423,10 @@ namespace Sass {
         else
         {
           List* mq = merge_media_queries(static_cast<Media_Block*>(b->node()), static_cast<Media_Block*>(parent));
-          static_cast<Media_Block*>(b->node())->media_queries(mq);
-          ss = b->node();
+          if (mq->length()) {
+            static_cast<Media_Block*>(b->node())->media_queries(mq);
+            ss = b->node();
+          }
         }
 
         if (!ss) continue;

Original file line number	Diff line number	Diff line change
`@@ -423,8 +423,10 @@ namespace Sass {`
`423`	`423`	`else`
`424`	`424`	`{`
`425`	`425`	`List* mq = merge_media_queries(static_cast<Media_Block>(b->node()), static_cast<Media_Block>(parent));`
`426`		`- static_cast<Media_Block*>(b->node())->media_queries(mq);`
`427`		`- ss = b->node();`
	`426`	`+ if (mq->length()) {`
	`427`	`+ static_cast<Media_Block*>(b->node())->media_queries(mq);`
	`428`	`+ ss = b->node();`
	`429`	`+ }`
`428`	`430`	`}`
`429`	`431`
`430`	`432`	`if (!ss) continue;`