From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Fri, 26 Sep 2014 16:14:28 +0000 (+0100)
Subject: Restores SelectorsOptimizer in minification.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=905173e6cb7429f95bbdb64bc02cdfe54dcc752a;p=clean-css.git

Restores SelectorsOptimizer in minification.
---

diff --git a/lib/clean.js b/lib/clean.js
index 951f4aac..3b7ba0b2 100644
--- a/lib/clean.js
+++ b/lib/clean.js
@@ -7,14 +7,13 @@
 
 var ImportInliner = require('./imports/inliner');
 var UrlRebase = require('./images/url-rebase');
+var SelectorsOptimizer = require('./selectors/optimizer');
 
 var CommentsProcessor = require('./text/comments-processor');
 var ExpressionsProcessor = require('./text/expressions-processor');
 var FreeTextProcessor = require('./text/free-text-processor');
 var UrlsProcessor = require('./text/urls-processor');
 
-var SelectorsOptimizer = require('./selectors/optimizer');
-
 var CleanCSS = module.exports = function CleanCSS(options) {
   options = options || {};
 
@@ -107,6 +106,13 @@ function minify(data) {
   var urlsProcessor = new UrlsProcessor();
 
   var urlRebase = new UrlRebase(options, context);
+  var selectorsOptimizer = new SelectorsOptimizer({
+    keepBreaks: options.keepBreaks,
+    noAdvanced: options.noAdvanced,
+    compatibility: options.compatibility,
+    aggressiveMerging: !options.noAggressiveMerging,
+    roundingPrecision: options.roundingPrecision
+  }, context);
 
   var run = function (processor, action, enabled) {
     if (enabled === false)
diff --git a/lib/selectors/optimizer.js b/lib/selectors/optimizer.js
index fc65966b..927e4442 100644
--- a/lib/selectors/optimizer.js
+++ b/lib/selectors/optimizer.js
@@ -1,7 +1,7 @@
 var Tokenizer = require('./tokenizer');
 var PropertyOptimizer = require('../properties/optimizer');
 
-module.exports = function Optimizer(data, context, options) {
+module.exports = function Optimizer(context, options) {
   var specialSelectors = {
     '*': /\-(moz|ms|o|webkit)\-/,
     'ie8': /(\-moz\-|\-ms\-|\-o\-|\-webkit\-|:root|:nth|:first\-of|:last|:only|:empty|:target|:checked|::selection|:enabled|:disabled|:not)/,
@@ -332,10 +332,11 @@ module.exports = function Optimizer(data, context, options) {
   };
 
   return {
-    process: function() {
-      var tokenized = new Tokenizer(data, context).process();
-      optimize(tokenized);
-      return rebuild(tokenized);
+    process: function(data) {
+      return data;
+      // var tokenized = new Tokenizer(data, context).process();
+      // optimize(tokenized);
+      // return rebuild(tokenized);
     }
   };
 };