1.2.1

littledu · littledu · commit b28c16f97205 · 2016-06-23T16:44:32.000+08:00
1. 修复快速新建项目问题
2. 优化任务执行交互
3. 更换统计代码
4. 全新的 macOS 安装界面
diff --git a/about.html b/about.html
@@ -5,6 +5,82 @@
     <title></title>
     <link rel="stylesheet" href="assets/css/reset.css">
     <link rel="stylesheet" href="assets/css/app.css">
+
+    <script type="text/javascript">
+
+        window.nodeRequire = require;
+        delete window.require;
+        delete window.exports;
+        delete window.module;
+
+        // Pretend that cookies work
+        (function (document) {
+            var cookies = {};
+            document.__defineGetter__('cookie', function () {
+                var output = [];
+                for (var cookieName in cookies) {
+                    output.push(cookieName + "=" + cookies[cookieName]);
+                }
+                return output.join(";");
+            });
+            document.__defineSetter__('cookie', function (s) {
+                var indexOfSeparator = s.indexOf("=");
+                var key = s.substr(0, indexOfSeparator);
+                var value = s.substring(indexOfSeparator + 1);
+                cookies[key] = value;
+                return key + "=" + value;
+            });
+            document.clearCookies = function () {
+                cookies = {};
+            };
+
+            originalLocation = document.location;
+            // Pretend that we're hosted on an Internet Website
+            document.__defineGetter__('location', function () {
+                return {
+                    href: 'http://weflow.app/',
+                    protocol: 'http:',
+                    host: 'weflow.app',
+                    port: '',
+                    pathname: '/',
+                    search: '',
+                    hash: '',
+                    username: '',
+                    password: '',
+                    origin: 'http://weflow.app',
+                    reload: function () {
+                        return originalLocation.reload.apply(originalLocation, arguments);
+                    }
+                };
+            });
+
+            // Nobody sets location
+            document.__defineSetter__('location', function () {
+            })
+        })(document);
+
+        (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', 'https://o4jiepyc4.qnssl.com/analytics.js', 'ga');
+        // qiniu CDN for speeding up ga.js -> https://www.google-analytics.com/analytics.js
+
+        // Get using version of WeFlow
+        var version = nodeRequire('./package.json').version;
+
+        ga('create', 'UA-24431632-7', 'auto');
+        ga('set', 'checkProtocolTask', null); // Disable file protocol checking.
+        ga('set', 'location', '/about.html'); // Allow file:// request for GA
+        ga('send', 'pageview');
+
+    </script>
 </head>
 <body>
 
diff --git a/app.html b/app.html
@@ -6,7 +6,6 @@
     <link rel="stylesheet" href="assets/css/reset.css">
     <link rel="stylesheet" href="assets/css/app.css">
 
-    <script type="text/javascript" src="http://tajs.qq.com/stats?sId=56909571" charset="UTF-8"></script>
     <script type="text/javascript">
 
         window.nodeRequire = require;
@@ -134,7 +133,7 @@
 
 <div class="setting hide" id="js-setting">
     <a href="javascript:;" id="js-setting-close" class="icon icon-close"></a>
-    <a href="javascript:;" id="js-help" class="icon icon-help"></a>
+    <a href="https://github.com/weixin/weflow" id="js-help" class="icon icon-help"></a>
 
     <div class="setting__section" id="js-workspace">
         <div class="setting__hd">工作区路径</div>
@@ -222,5 +221,6 @@
 <script src="./assets/js/jquery.min.js"></script>
 <script src="./src/app.js"></script>
 <script src="./src/menu.js"></script>
+<script type="text/javascript" src="http://pingjs.qq.com/h5/stats.js" name="MTAH5" sid="500140708"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "WeFlow",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "release": "1.2.0",
   "description": "A minimal Electron application",
   "main": "main.js",
diff --git a/src/_tasks/dist.js b/src/_tasks/dist.js
@@ -239,6 +239,11 @@ function dist(projectPath, log, callback) {
             gulp.src(paths.tmp.dirAll)
                 .pipe(revAll.revision())
                 .pipe(gulp.dest(paths.tmp.dir))
+                .pipe(revDel({
+                    exclude: /(.html|.htm)$/
+                }))
+                .pipe(revAll.manifestFile())
+                .pipe(gulp.dest(paths.tmp.dir))
                 .on('end', function () {
                     console.log('reversion success.');
                     log('reversion success.');
diff --git a/src/_tasks/ftp.js b/src/_tasks/ftp.js
@@ -2,6 +2,7 @@
 
 const path = require('path');
 const async = require('async');
+const gulp = require('gulp');
 const _ = require('lodash');
 const del = require('del');
 const ftp = require('gulp-ftp');
@@ -19,6 +20,13 @@ module.exports = function (projectPath, log, callback) {
         config = Common.requireUncached(path.join(__dirname, '../../weflow.config.json'));
     }
 
+    let configFTP = config.ftp;
+
+    if(configFTP.host === '' || configFTP.port === '' || configFTP.user === ''){
+        callback('ftp config');
+        return;
+    }
+
     let projectName = path.basename(projectPath);
 
     //清除目标目录
@@ -36,7 +44,7 @@ module.exports = function (projectPath, log, callback) {
         let distPath = config['ftp']['includeHtml'] ? path.join(projectPath, './dist/**/*') : [path.join(projectPath, './dist/**/*'), path.join(projectPath, '!./dist/html/**/*.html')];
 
 
-        vfs.src(distPath, {base: '.'})
+        gulp.src(distPath, {base: '.'})
             .pipe(ftp(ftpConfig))
             .on('end', function () {
                 console.log('ftp success.');
diff --git a/src/app.js b/src/app.js
diff --git a/src/menu.js b/src/menu.js

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "WeFlow",`
`3`		`- "version": "1.2.0",`
	`3`	`+ "version": "1.2.1",`
`4`	`4`	`"release": "1.2.0",`
`5`	`5`	`"description": "A minimal Electron application",`
`6`	`6`	`"main": "main.js",`