Sorry, the diff of this file is not supported yet
+1
-1
@@ -450,3 +450,3 @@ /** | ||
| // restore preserved comments and strings | ||
| for (i = 0, max = preservedTokens.length; i < max; i = i + 1) { | ||
| for (var i = 0, max = preservedTokens.length; i < max; i = i + 1) { | ||
| css = css.replace("___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_" + i + "___", preservedTokens[i]); | ||
@@ -453,0 +453,0 @@ } |
+9
-2
@@ -29,2 +29,4 @@ var fs = require('fs'), | ||
| cfg.silent = !!cfg.silent; | ||
| cfg.output = path.resolve(path.normalize(cfg.output)); | ||
@@ -163,3 +165,4 @@ | ||
| config = self.config, | ||
| file = config.target; | ||
| file = config.target, | ||
| report = {}; | ||
@@ -193,3 +196,7 @@ utils.log('start analyze file : ' + file, 'debug'); | ||
| self.generateOutput(data); | ||
| callback && callback(); | ||
| report.imports = self.imports; | ||
| report.target = self.config.target; | ||
| report.output = self.config.output; | ||
| callback && callback(null, report); | ||
| }); | ||
@@ -196,0 +203,0 @@ }); |
+1
-1
| { | ||
| "name":"css-combo", | ||
| "version":"0.2.3", | ||
| "version":"0.2.4", | ||
| "description":"css module combo tool", | ||
@@ -5,0 +5,0 @@ "author":"Dorange <daxingplay@gmail.com>", |
@@ -13,3 +13,3 @@ var CssCombo = require('../lib/index'), | ||
| compress: 0 | ||
| }, function(e){ | ||
| }, function(e, report){ | ||
| if(e){ | ||
@@ -19,3 +19,14 @@ console.dir(e); | ||
| console.log('success'); | ||
| console.log('report'); | ||
| console.log(report); | ||
| if (report.target !== path.resolve(__dirname, 'css/test.source.css')) { | ||
| throw new Error('report.target Error'); | ||
| } | ||
| if (report.output !== path.resolve(__dirname, 'css/test.combo.css')) { | ||
| throw new Error('report.output Error'); | ||
| } | ||
| if (report.imports.length !== 5) { | ||
| throw new Error('report.imports Error'); | ||
| } | ||
| } | ||
| }); |
+44
-46
@@ -39,3 +39,2 @@ /* | ||
| /*ucool filePath=http://10.249.196.92:80/tbsp/tbsp.source.css*/ | ||
| /*! Taobao Style Platform Copyright(c) 2008-2100, Taobao.com Inc. Some rights reserved. */ | ||
@@ -47,11 +46,11 @@ | ||
| * Update Log: | ||
| * 2009-05-18 yubo ��html��Ĭ�ϱ���ɫ�Ӱ�ɫ�ij��� | ||
| * 2009-03-26 yubo ��reset.css��base.css�ϲ�Ϊreset.css | ||
| * 2009-02-11 yubo ��small����ʽҲreset�� | ||
| * 2009-05-18 yubo html | ||
| * 2009-03-26 yubo reset.css base.css reset.css | ||
| * 2009-02-11 yubo small reset | ||
| * 2009-02-10 yubo border: 0 -> border: none | ||
| * 2008-12-23 yubo margin: 0; padding: 0 �м��� button. ����Ԫ�������ʽ��Ҳ����button | ||
| * 2008-12-23 yubo margin: 0; padding: 0 �� button. button | ||
| * 2008-11-12 yubo created initial version | ||
| */ | ||
| body { font: 12px/1.5 Tahoma,Helvetica,Arial,'����',sans-serif; } | ||
| body { font: 12px/1.5 Tahoma,Helvetica,Arial,' |