From: Jakub Pawlowicz <contact@jakubpawlowicz.com>
Date: Wed, 20 May 2015 19:57:06 +0000 (+0100)
Subject: Fixes sorting of options in compatibility.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fa92fb8a60e91e07cb8446280b5358ac1e8f6b6c;p=clean-css.git

Fixes sorting of options in compatibility.
---

diff --git a/lib/utils/compatibility.js b/lib/utils/compatibility.js
index 331c721e..bb81e8ba 100644
--- a/lib/utils/compatibility.js
+++ b/lib/utils/compatibility.js
@@ -6,8 +6,8 @@ var DEFAULTS = {
       opacity: true // rgba / hsla
     },
     properties: {
-      backgroundSizeMerging: false, // background-size to shorthand
       backgroundClipMerging: false, // background-clip to shorthand
+      backgroundSizeMerging: false, // background-size to shorthand
       colors: true, // any kind of color transformations, like `#ff00ff` to `#f0f` or `#fff` into `red`
       iePrefixHack: false, // underscore / asterisk prefix hacks on IE
       ieSuffixHack: false, // \9 suffix hacks on IE
@@ -36,8 +36,8 @@ var DEFAULTS = {
       opacity: false
     },
     properties: {
-      backgroundSizeMerging: false,
       backgroundClipMerging: false,
+      backgroundSizeMerging: false,
       colors: true,
       iePrefixHack: true,
       ieSuffixHack: true,
@@ -66,8 +66,8 @@ var DEFAULTS = {
       opacity: false
     },
     properties: {
-      backgroundSizeMerging: false,
       backgroundClipMerging: false,
+      backgroundSizeMerging: false,
       colors: true,
       iePrefixHack: true,
       ieSuffixHack: true,
diff --git a/test/utils/compatibility-test.js b/test/utils/compatibility-test.js
index 46cb894c..9a9d08a9 100644
--- a/test/utils/compatibility-test.js
+++ b/test/utils/compatibility-test.js
@@ -11,8 +11,8 @@ vows.describe(Compatibility)
       'gets default options': function(options) {
         assert.isTrue(options.colors.opacity);
         assert.isTrue(options.properties.colors);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.iePrefixHack);
         assert.isFalse(options.properties.ieSuffixHack);
         assert.isTrue(options.properties.merging);
@@ -45,8 +45,8 @@ vows.describe(Compatibility)
       },
       'gets merged options': function(options) {
         assert.isTrue(options.colors.opacity);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.colors);
         assert.isFalse(options.properties.iePrefixHack);
         assert.isFalse(options.properties.ieSuffixHack);
@@ -73,8 +73,8 @@ vows.describe(Compatibility)
       },
       'gets template options': function(options) {
         assert.isFalse(options.colors.opacity);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.colors);
         assert.isTrue(options.properties.iePrefixHack);
         assert.isTrue(options.properties.ieSuffixHack);
@@ -100,8 +100,8 @@ vows.describe(Compatibility)
       },
       'gets template options': function(options) {
         assert.isFalse(options.colors.opacity);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.colors);
         assert.isTrue(options.properties.iePrefixHack);
         assert.isTrue(options.properties.ieSuffixHack);
@@ -137,8 +137,8 @@ vows.describe(Compatibility)
       },
       'gets calculated options': function(options) {
         assert.isTrue(options.colors.opacity);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.colors);
         assert.isFalse(options.properties.iePrefixHack);
         assert.isTrue(options.properties.ieSuffixHack);
@@ -165,8 +165,8 @@ vows.describe(Compatibility)
       'gets calculated options': function(options) {
         assert.isTrue(options.colors.opacity);
         assert.isTrue(options.properties.colors);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.iePrefixHack);
         assert.isFalse(options.properties.ieSuffixHack);
         assert.isTrue(options.properties.merging);
@@ -192,8 +192,8 @@ vows.describe(Compatibility)
       'gets calculated options': function(options) {
         assert.isTrue(options.colors.opacity);
         assert.isTrue(options.properties.colors);
-        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isFalse(options.properties.backgroundClipMerging);
+        assert.isFalse(options.properties.backgroundSizeMerging);
         assert.isTrue(options.properties.iePrefixHack);
         assert.isFalse(options.properties.ieSuffixHack);
         assert.isTrue(options.properties.merging);