windows 添加菜单

littledu · littledu · commit b10a74ad3fa9 · 2016-06-20T17:28:30.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,7 @@
 {
   "name": "WeFlow",
   "version": "1.2.0",
+  "release": "1.1.0",
   "description": "A minimal Electron application",
   "main": "main.js",
   "scripts": {
diff --git a/src/app.js b/src/app.js
@@ -124,27 +124,25 @@ function checkLocalProjects() {
 
 //检查更新
 function checkForUpdate(action) {
-    if (action) {
-        checkHandler = $.ajax({
-            method: 'GET',
-            url: Common.CHECKURL,
-            dataType: 'json',
-            cache: false,
-            success: function (data) {
-                if (data[0].tag_name > packageJson.version) {
-                    ipc.send('checkForUpdate', 1)
-                }else{
-                    ipc.send('checkForUpdate', 0);
-                }
+    checkHandler = $.ajax({
+        method: 'GET',
+        url: Common.CHECKURL,
+        dataType: 'json',
+        cache: false,
+        success: function (data) {
+            if (data && data.release && data.release > packageJson.version) {
+                ipc.send('checkForUpdate', 1)
+            }else{
+                action && ipc.send('checkForUpdate', 0);
             }
-        });
-    }
+        }
+    });
 }
 
 ipc.on('checkForUpdateReply', function (event, index, status) {
     if(status){
         if(index === 1){
-            alert('哈哈哈, 你真的以为我等下会提醒你吗?');
+            alert('哈哈哈, 你真的以为我等下会提醒你吗?赶紧去下载最新版本吧！');
         }else{
             shell.openExternal(Common.DOWNLOADURL);
         }
@@ -693,16 +691,8 @@ $setting.on('change', 'input', function () {
 
                 async.series([
                     function (next) {
-                        if (Common.PLATFORM === 'win32') {
-                            //windows 删除目录有bug
-                            next();
-                        } else {
-                            shell.moveItemToTrash(originWorkspace);
-                            next();
-                            // del([originWorkspace], {force: true}).then(function () {
-                            //     next();
-                            // })
-                        }
+                        shell.moveItemToTrash(originWorkspace);
+                        next();
                     },
                     function (next) {
                         //更新 localstorage
diff --git a/src/common.js b/src/common.js
@@ -16,7 +16,7 @@ Common.DEFAULT_PATH = Common.PLATFORM === 'win32' ? 'desktop' : 'home';
 Common.TEMPLAGE_PROJECT = path.resolve(path.join(__dirname, '../templates/project.zip'));
 Common.TEMPLAGE_EXAMPLE = path.resolve(path.join(__dirname, '../templates/example.zip'));
 Common.EXAMPLE_NAME = 'WeFlow-example';
-Common.CHECKURL = 'https://api.github.com/repos/weixin/WeFlow/releases';
+Common.CHECKURL = 'https://raw.githubusercontent.com/weixin/WeFlow/master/package.json';
 Common.DOWNLOADURL = 'https://github.com/weixin/WeFlow/releases';
 
 Common.requireUncached = function (module) {
diff --git a/src/menu.js b/src/menu.js
@@ -159,7 +159,7 @@ var template = [
     }
 ];
 
-if (process.platform == 'darwin') {
+if (process.platform === 'darwin') {
     var name = remote.app.getName();
     template.unshift({
         label: name,
@@ -225,6 +225,23 @@ if (process.platform == 'darwin') {
             }
         ]
     });
+}else if(process.platform === 'win32'){
+    let helpItem = template[template.length-1];
+    
+    helpItem.submenu.unshift({
+        label: '检查更新…',
+        accelerator: '',
+        click: function () {
+            checkForUpdate(true);
+        }
+    });
+
+    helpItem.submenu.unshift({
+        label: '关于',
+        click: function (item, focusedWindow) {
+            showAbout();
+        }
+    });
 }
 
 var menu = Menu.buildFromTemplate(template);

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