Merge branch 'v3' of github.com:mycard/mycard into v3

app/app-detail.component.html

@@ -152,9 +152,13 @@
 
                     </div>
                     <div id="local-files" role="tabpanel" class="tab-pane fade">
-                        <button type="button" (click)="uninstall()">
-                            {{'uninstall'|translate}}
-                        </button>
+                        <div class="list-inline">
+                            <button type="button" [disabled]="!isInstalled" (click)="uninstall()">
+                                {{'uninstall'|translate}}
+                            </button>
+                            <i *ngIf="uninstalling" class="fa fa-circle-o-notch fa-spin fa-3x fa-fw"></i>
+                            <span class="sr-only">Loading...</span>
+                        </div>
                     </div>
                 </div>
             </div>

app/app-detail.component.ts

@@ -113,9 +113,17 @@ export class AppDetailComponent {
 
     }
 
+    uninstalling: boolean;
+
     uninstall(id: string) {
-        id = this.currentApp.id;
-        this.appsService.uninstall(id);
+        if (confirm("确认删除？")) {
+            this.uninstalling = true;
+            id = this.currentApp.id;
+            this.appsService.uninstall(id).then(()=> {
+                    this.uninstalling = false;
+                }
+            );
+        }
     }
 
 

app/apps.service.ts

@@ -250,9 +250,9 @@ export class AppsService {
             // 删除本目录
             files.push('.');
             let install_dir = this.searchApp(id).local.path;
-            files
+            return files
                 .map((file)=>
-                    ()=>Promise.resolve(path.join(install_dir, file))
+                    ()=>path.join(install_dir, file)
                 )
                 .reduce((promise: Promise<string>, task)=>
                         promise.then(task).then(this.deleteFile)

i18n/zh-CN.json

@@ -3,7 +3,8 @@
   "community": "社区",
   "settings": "设置",
   "uninstall": "卸载",
-  "general":"常规",
-  "updates":"更新",
-  "local files":"本地文件"
+  "general": "常规",
+  "updates": "更新",
+  "local files": "本地文件",
+  "uninstall confirm": "这将删除所有本地内容，确认执行？"
 }