From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Thu, 14 May 2015 17:43:53 +0000 (+0100)
Subject: Fixes #572 - empty elements removal.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=e7c8fd2f25983915c30143a93eca43409d7b7a3d;p=clean-css.git

Fixes #572 - empty elements removal.

So we shared `token` variable among more than one context, which was
causing issues when removing empty elements.
---

diff --git a/History.md b/History.md
index c8a6b9eb..49b52898 100644
--- a/History.md
+++ b/History.md
@@ -13,6 +13,11 @@
 * Fixed issue [#517](https://github.com/jakubpawlowicz/clean-css/issues/517) - turning off color optimizations.
 * Fixed issue [#542](https://github.com/jakubpawlowicz/clean-css/issues/542) - space after closing brace in IE.
 
+[3.2.10 / 2015-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.9...3.2)
+==================
+
+* Fixed issue [#572](https://github.com/jakubpawlowicz/clean-css/issues/572) - empty elements removal.
+
 [3.2.9 / 2015-05-08](https://github.com/jakubpawlowicz/clean-css/compare/v3.2.8...v3.2.9)
 ==================
 
diff --git a/lib/selectors/optimizers/simple.js b/lib/selectors/optimizers/simple.js
index 888e95bd..6582d837 100644
--- a/lib/selectors/optimizers/simple.js
+++ b/lib/selectors/optimizers/simple.js
@@ -290,11 +290,10 @@ SimpleOptimizer.prototype.optimize = function(tokens) {
   var ie7Hack = options.compatibility.selectors.ie7Hack;
   var adjacentSpace = options.compatibility.selectors.adjacentSpace;
   var spaceAfterClosingBrace = options.compatibility.properties.spaceAfterClosingBrace;
-  var token;
 
   function _cleanupCharsets(tokens) {
     for (var i = 0, l = tokens.length; i < l; i++) {
-      token = tokens[i];
+      var token = tokens[i];
 
       if (token[0] != 'at-rule')
         continue;
@@ -317,7 +316,7 @@ SimpleOptimizer.prototype.optimize = function(tokens) {
     var mayHaveCharset = false;
 
     for (var i = 0, l = tokens.length; i < l; i++) {
-      token = tokens[i];
+      var token = tokens[i];
 
       switch (token[0]) {
         case 'selector':
diff --git a/test/media-queries-test.js b/test/media-queries-test.js
index 3a54c9aa..13a89430 100644
--- a/test/media-queries-test.js
+++ b/test/media-queries-test.js
@@ -19,6 +19,14 @@ vows.describe('media queries')
       'get merged': function(minified) {
         assert.equal(minified.styles, '@font-face{font-family:A}@font-face{font-family:B}');
       }
+    },
+    'with empty selector': {
+      'topic': function () {
+        return new CleanCSS().minify('@media screen{a{color:red}div{}}');
+      },
+      'get merged': function(minified) {
+        assert.equal(minified.styles, '@media screen{a{color:red}}');
+      }
     }
   })
   .addBatch({