From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Mon, 6 Oct 2014 20:28:50 +0000 (+0100)
Subject: Reverses boolean passed to property optimizer.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=ca88f40195d6b71dca9846a490f3730da811d98c;p=clean-css.git

Reverses boolean passed to property optimizer.
---

diff --git a/lib/properties/optimizer.js b/lib/properties/optimizer.js
index a04d73f2..0d321d1a 100644
--- a/lib/properties/optimizer.js
+++ b/lib/properties/optimizer.js
@@ -257,12 +257,12 @@ module.exports = function Optimizer(compatibility, aggressiveMerging, context) {
   };
 
   return {
-    process: function(selector, body, allowAdjacent, skipCompacting) {
+    process: function(selector, body, allowAdjacent, compactProperties) {
       var tokenized = tokenize(body, selector);
       var optimized = optimize(tokenized, allowAdjacent);
       var rebuilt = rebuild(optimized);
 
-      return !skipCompacting && processableInfo.implementedFor.test(rebuilt) ?
+      return compactProperties && processableInfo.implementedFor.test(rebuilt) ?
         compact(rebuilt) :
         rebuilt;
     }
diff --git a/lib/selectors/optimizers/advanced.js b/lib/selectors/optimizers/advanced.js
index 3b1f1b41..68a98822 100644
--- a/lib/selectors/optimizers/advanced.js
+++ b/lib/selectors/optimizers/advanced.js
@@ -62,7 +62,7 @@ AdvancedOptimizer.prototype.mergeAdjacent = function (tokens) {
     // TODO: broken due to joining/splitting
     if (lastToken.selector && token.selector.join(',') == lastToken.selector.join(',')) {
       var joinAt = [lastToken.body.length];
-      lastToken.body = this.propertyOptimizer.process(token.selector, lastToken.body.concat(token.body), joinAt, false);
+      lastToken.body = this.propertyOptimizer.process(token.selector, lastToken.body.concat(token.body), joinAt, true);
       forRemoval.push(i);
       // TODO: broken due to joining/splitting
     } else if (lastToken.body && token.body.join(';') == lastToken.body.join(';') && !this.isSpecial(token.selector.join(',')) && !this.isSpecial(lastToken.selector.join(','), this.options)) {
@@ -215,7 +215,7 @@ AdvancedOptimizer.prototype.reduceSelector = function (tokens, selector, data, o
       joinsAt.push((joinsAt[j - 1] || 0) + splitBodies[j].length);
   }
 
-  var optimizedBody = this.propertyOptimizer.process(selector, bodies, joinsAt, true);
+  var optimizedBody = this.propertyOptimizer.process(selector, bodies, joinsAt, false);
   var optimizedProperties = optimizedBody;
 
   var processedCount = processedTokens.length;
@@ -246,7 +246,7 @@ function optimizeProperties(tokens, propertyOptimizer) {
     var token = tokens[i];
 
     if (token.selector) {
-      token.body = propertyOptimizer.process(token.selector, token.body, false, false);
+      token.body = propertyOptimizer.process(token.selector, token.body, false, true);
     } else if (token.block) {
       optimizeProperties(token.body, propertyOptimizer);
     }