From b2c45d9de6980c2d71c3a3ffd23a5281e9b7b990 Mon Sep 17 00:00:00 2001
From: Amio <amio.cn@gmail.com>
Date: Thu, 6 Mar 2014 12:50:54 +0800
Subject: [PATCH] =?UTF-8?q?WA=E7=8E=AF=E5=A2=83=EF=BC=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=20gulp=20usemin=20=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/index.html | 13 +------------
 gulpfile.js    |  8 ++++----
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/index.html b/app/index.html
index a719d7f..050eacf 100644
--- a/app/index.html
+++ b/app/index.html
@@ -4,7 +4,7 @@
 	<meta charset="utf-8">
 	<title>Protoshop - 携程无线</title>
 	<meta name="viewport" content="width=device-width" />
-	<!-- build:css(.tmp) styles/main.css -->
+	<!-- build:css styles/main.css -->
 	<link rel="stylesheet" href="styles/main.css" />
 	<link rel="stylesheet" href="styles/font.css" />
 	<!-- endbuild -->
@@ -41,16 +41,5 @@
 <script src="scripts/controllers/package-edit.js"></script>
 <!-- endbuild -->
 
-<script>
-	(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-		(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-			m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-	ga('create', 'UA-48582044-2', 'ctripcorp.com');
-	ga('send', 'pageview');
-
-</script>
-
 </body>
 </html>
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 0e3f4ed..a6732a2 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -78,9 +78,9 @@ var rev = require('gulp-rev');
 gulp.task('usemin', function () {
   gulp.src('./app/*.html')
     .pipe(usemin({
-      css: [minifycss(), 'concat', rev()],
-      html: [minifyhtml({empty: true})],
-      js: [uglify(), rev()]
+      css: [minifycss(), rev()],
+      js: [uglify(), rev()],
+      html: [minifyhtml({empty: true})]
     }))
     .pipe(gulp.dest(BUILD_ROOT));
 });
@@ -136,7 +136,7 @@ gulp.task('dist', function () {
     beta: 'sxxie@wxddb1.qa.nt.ctripcorp.com:/usr/local/httpd/htdocs/beta/html/'
   };
   var rsyncParams = ' -avz -e ssh --delete --exclude=.git* --exclude=*.scss --exclude=node_modules';
-  
+
   sh('rsync ' + BUILD_ROOT + '/ ' + target.beta + rsyncParams);
 });