grunt-combohtml - npm Package Compare versions

Comparing version 0.1.6 to 0.1.7

package.json

		{
		"name": "grunt-combohtml",
		"description": "combine build html with ssi.",
		"version": "0.1.6",
		"version": "0.1.7",
		"homepage": "",
		@@ -40,3 +40,3 @@ "author": {
		"readmeFilename": "README.md",
		"_id": "grunt-combohtml@0.1.5",
		"_id": "grunt-combohtml@0.1.6",
		"_from": "grunt-combohtml@",
		@@ -43,0 +43,0 @@ "dist": {

README.md

		@@ -35,3 +35,5 @@ # grunt-combohtml
		to:'build/'
		}
		},
		comboJS:true, // 是否静态合并当前页面引用的本地js
		comboCSS:true // 是否静态合并当前页面引用的css
		},
		@@ -38,0 +40,0 @@ main:{

tasks/combohtml.js

		@@ -51,7 +51,15 @@ /*

		var js_content = concat(result.js,dest_js,v.orig.cwd,p,options.replacement);
		var css_content = concat(result.css,dest_css,v.orig.cwd,p,options.replacement);
		if(typeof options.comboJS == 'undefined' \|\| options.comboJS === true){
		var js_content = concat(result.js,dest_js,v.orig.cwd,p,options.replacement);
		}
		if(typeof options.comboCSS == 'undefined' \|\| options.comboCSS === true){
		var css_content = concat(result.css,dest_css,v.orig.cwd,p,options.replacement);
		}

		chunk = chunk.replace('@@script',path.basename(v.dest,path.extname(v.dest)) + '.js');
		chunk = chunk.replace('@@style',path.basename(v.dest,path.extname(v.dest)) + '.css');
		if(typeof options.comboJS == 'undefined' \|\| options.comboJS === true){
		chunk = chunk.replace('@@script',path.basename(v.dest,path.extname(v.dest)) + '.js');
		}
		if(typeof options.comboCSS == 'undefined' \|\| options.comboCSS === true){
		chunk = chunk.replace('@@style',path.basename(v.dest,path.extname(v.dest)) + '.css');
		}
		chunk = tidy(chunk);
		@@ -58,0 +66,0 @@

New alerts