From: GoalSmashers Date: Fri, 30 Aug 2013 07:35:09 +0000 (+0200) Subject: Updates #84 - adds media processing to external files. X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=fe5906b2eff1a10a77f6f770d9d788567323df54;p=clean-css.git Updates #84 - adds media processing to external files. --- diff --git a/lib/imports/inliner.js b/lib/imports/inliner.js index 9f3a3867..ad0777dc 100644 --- a/lib/imports/inliner.js +++ b/lib/imports/inliner.js @@ -46,7 +46,7 @@ module.exports = function Inliner() { .trim(); if (/^(http|https):\/\//.test(importedFile) || /^\/\//.test(importedFile)) - return '@import url(' + importedFile + ');'; + return '@import url(' + importedFile + ')' + (mediaQuery.length > 0 ? ' ' + mediaQuery : '') + ';'; var relativeTo = importedFile[0] == '/' ? options.root : diff --git a/test/unit-test.js b/test/unit-test.js index f927f87a..d6c6f74c 100644 --- a/test/unit-test.js +++ b/test/unit-test.js @@ -821,10 +821,12 @@ title']", "@import url('https://pro.goalsmashers.com/test.css');", "@import url(https://pro.goalsmashers.com/test.css);" ], + 'of a remote file with media': "@import url(https://pro.goalsmashers.com/test.css) screen,tv;", 'of a url starting with //': [ "@import url(//fonts.googleapis.com/css?family=Lato:400,700,400italic|Merriweather:400,700);", "@import url(//fonts.googleapis.com/css?family=Lato:400,700,400italic|Merriweather:400,700);" ], + 'of a remote file via // url with media': "@import url(//pro.goalsmashers.com/test.css) screen,tv;", 'of a directory': [ "@import url(test/data/partials);", ""