From 52855a3a4808b6c2844978cf162a623f3bb28dc5 Mon Sep 17 00:00:00 2001 From: Jakub Pawlowicz Date: Tue, 14 Feb 2017 13:53:33 +0100 Subject: [PATCH] Fixes #893 - `inline: false` as alias to `inline: 'none'`. Why: * So it matches other options where `false` means 'disable'. --- History.md | 5 +++++ README.md | 6 ++++++ lib/options/inline.js | 4 ++++ test/module-test.js | 8 ++++++++ 4 files changed, 23 insertions(+) diff --git a/History.md b/History.md index 55de6be6..5b81f6de 100644 --- a/History.md +++ b/History.md @@ -1,3 +1,8 @@ +[4.1.0-pre / 20xx-xx-xx](https://github.com/jakubpawlowicz/clean-css/compare/4.0...HEAD) +================== + +* Fixed issue [#893](https://github.com/jakubpawlowicz/clean-css/issues/893) - `inline: false` as alias to `inline: 'none'`. + [4.0.7 / 2017-02-14](https://github.com/jakubpawlowicz/clean-css/compare/v4.0.6...v4.0.7) ================== diff --git a/README.md b/README.md index e44eb7f0..fceb574b 100644 --- a/README.md +++ b/README.md @@ -213,6 +213,12 @@ new CleanCSS({ }) ``` +```js +new CleanCSS({ + inline: false // disables all inlining (alias to `['none']`) +}) +``` + ```js new CleanCSS({ inline: ['all'] // enables all inlining, same as ['local', 'remote'] diff --git a/lib/options/inline.js b/lib/options/inline.js index 4a699707..54761f40 100644 --- a/lib/options/inline.js +++ b/lib/options/inline.js @@ -3,6 +3,10 @@ function inlineOptionsFrom(rules) { return rules; } + if (rules === false) { + return ['none']; + } + return undefined === rules ? ['local'] : rules.split(','); diff --git a/test/module-test.js b/test/module-test.js index d809bb19..52a1d879 100644 --- a/test/module-test.js +++ b/test/module-test.js @@ -547,6 +547,14 @@ vows.describe('module tests').addBatch({ assert.equal(minified.styles, '@import url(test/fixtures/partials/one.css);@import url(test/fixtures/partials/extra/three.css);@import url(test/fixtures/partials/extra/four.css);.two{color:#fff}'); } }, + 'off - with false alias': { + 'topic': function () { + return new CleanCSS({ inline: false }).minify(['./test/fixtures/partials/two.css']); + }, + 'should give right output': function (minified) { + assert.equal(minified.styles, '@import url(test/fixtures/partials/one.css);@import url(test/fixtures/partials/extra/three.css);@import url(test/fixtures/partials/extra/four.css);.two{color:#fff}'); + } + }, 'off - many files': { 'topic': function () { return new CleanCSS({ inline: 'none' }).minify(['./test/fixtures/partials/remote.css', './test/fixtures/partials-absolute/base.css']); -- 2.34.1