From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Sun, 26 Oct 2014 11:20:49 +0000 (+0000)
Subject: Renames variables in advanced optimiser to match others.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=46b0ef2a326c9126272917240741ccc54dd1d59a;p=clean-css.git

Renames variables in advanced optimiser to match others.
---

diff --git a/lib/selectors/optimizers/advanced.js b/lib/selectors/optimizers/advanced.js
index fd3f9984..45667769 100644
--- a/lib/selectors/optimizers/advanced.js
+++ b/lib/selectors/optimizers/advanced.js
@@ -92,7 +92,7 @@ AdvancedOptimizer.prototype.mergeAdjacent = function (tokens) {
 
 AdvancedOptimizer.prototype.reduceNonAdjacent = function (tokens) {
   var candidates = {};
-  var moreThanOnce = [];
+  var repeated = [];
 
   for (var i = tokens.length - 1; i >= 0; i--) {
     var token = tokens[i];
@@ -110,7 +110,7 @@ AdvancedOptimizer.prototype.reduceNonAdjacent = function (tokens) {
       if (!candidates[selector])
         candidates[selector] = [];
       else
-        moreThanOnce.push(selector);
+        repeated.push(selector);
 
       candidates[selector].push({
         where: i,
@@ -120,18 +120,18 @@ AdvancedOptimizer.prototype.reduceNonAdjacent = function (tokens) {
     }
   }
 
-  var reducedInSimple = this.reduceSimpleNonAdjacentCases(tokens, moreThanOnce, candidates);
+  var reducedInSimple = this.reduceSimpleNonAdjacentCases(tokens, repeated, candidates);
   var reducedInComplex = this.reduceComplexNonAdjacentCases(tokens, candidates);
 
   this.minificationsMade.unshift(reducedInSimple || reducedInComplex);
 };
 
-AdvancedOptimizer.prototype.reduceSimpleNonAdjacentCases = function (tokens, matches, positions) {
+AdvancedOptimizer.prototype.reduceSimpleNonAdjacentCases = function (tokens, repeated, candidates) {
   var reduced = false;
 
-  for (var i = 0, l = matches.length; i < l; i++) {
-    var selector = matches[i];
-    var data = positions[selector];
+  for (var i = 0, l = repeated.length; i < l; i++) {
+    var selector = repeated[i];
+    var data = candidates[selector];
 
     if (data.length < 2)
       continue;
@@ -153,15 +153,15 @@ AdvancedOptimizer.prototype.reduceSimpleNonAdjacentCases = function (tokens, mat
   return reduced;
 };
 
-AdvancedOptimizer.prototype.reduceComplexNonAdjacentCases = function (tokens, positions) {
+AdvancedOptimizer.prototype.reduceComplexNonAdjacentCases = function (tokens, candidates) {
   var reduced = false;
 
   allSelectors:
-  for (var complexSelector in positions) {
+  for (var complexSelector in candidates) {
     if (complexSelector.indexOf(',') == -1)
       continue;
 
-    var into = positions[complexSelector];
+    var into = candidates[complexSelector];
     var intoPosition = into[into.length - 1].where;
     var intoToken = tokens[intoPosition];
 
@@ -172,7 +172,7 @@ AdvancedOptimizer.prototype.reduceComplexNonAdjacentCases = function (tokens, po
 
     for (var j = 0, m = selectors.length; j < m; j++) {
       var selector = selectors[j];
-      var data = positions[selector];
+      var data = candidates[selector];
 
       if (data.length < 2)
         continue allSelectors;