Fixes #781 - regression in override compacting.

Checking every combination of override clashes should not fall
back to same values in case of multiplex components.

diff --git a/History.md b/History.md
index 1e9b625..93f8808 100644 (file)
--- a/History.md
+++ b/History.md
@@ -3,6 +3,11 @@
 
 * Requires Node.js 4.0+ to run.
 
+[3.4.16 / 2016-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/v3.4.15...3.4)
+==================
+
+* Fixed issue [#781](https://github.com/jakubpawlowicz/clean-css/issues/781) - regression in override compacting.
+
 [3.4.15 / 2016-06-01](https://github.com/jakubpawlowicz/clean-css/compare/v3.4.14...v3.4.15)
 ==================
 

diff --git a/lib/properties/every-combination.js b/lib/properties/every-combination.js
index 6149597..be3faa6 100644 (file)
--- a/lib/properties/every-combination.js
+++ b/lib/properties/every-combination.js
@@ -3,7 +3,7 @@ var shallowClone = require('./clone').shallow;
 var MULTIPLEX_SEPARATOR = ',';
 
 function everyCombination(fn, left, right, validator) {
-  var samePositon = !left.shorthand && !right.shorthand;
+  var samePositon = !left.shorthand && !right.shorthand && !left.multiplex && !right.multiplex;
   var _left = shallowClone(left);
   var _right = shallowClone(right);
 

diff --git a/test/properties/override-compacting-test.js b/test/properties/override-compacting-test.js
index 8765818..1e039c2 100644 (file)
--- a/test/properties/override-compacting-test.js
+++ b/test/properties/override-compacting-test.js
@@ -210,6 +210,15 @@ vows.describe(optimize)
         ]);
       }
     },
+    'shorthand then multiplex longhand - non mergeable value': {
+      'topic': 'p{background:#fff;background-image:__ESCAPED_URL_CLEAN_CSS0__,linear-gradient()}',
+      'into': function (topic) {
+        assert.deepEqual(_optimize(topic), [
+          [['background'], ['#fff']],
+          [['background-image'], ['__ESCAPED_URL_CLEAN_CSS0__'], [','], ['linear-gradient()']]
+        ]);
+      }
+    },
     'shorthand then longhand - border with rgba() and color opacity on': {
       'topic': 'p{border:solid rgba(0,0,0,0);border-color:transparent}',
       'into': function (topic) {