From ae41d02f3784170f36961c30139a9ad58d4691df Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Thu, 22 Sep 2016 11:40:20 -0400
Subject: clean up conf files

Former-commit-id: 3c6cef932a74aa7e8224f8096286e7c5002e4dd6
---
 ionic.config.json     |  3 ++-
 ionic.project.desktop | 25 -------------------------
 make_desktop.sh       |  2 +-
 www/js/DataModel.js   |  2 +-
 4 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 ionic.project.desktop

diff --git a/ionic.config.json b/ionic.config.json
index 40dc6930..9ea31b20 100644
--- a/ionic.config.json
+++ b/ionic.config.json
@@ -1,10 +1,11 @@
 {
   "name": "zmNinja",
   "app_id": "8f73ad5f",
+  "defaultBrowser": "google chrome",
   "proxies": [
     {
       "path": "/zm",
-      "proxyUrl": "",
+      "proxyUrl": "http://server/zm",
       "rejectUnauthorized": false
     }
   ],
diff --git a/ionic.project.desktop b/ionic.project.desktop
deleted file mode 100644
index bad49608..00000000
--- a/ionic.project.desktop
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-  "name": "zmNinja",
-  "app_id": "8f73ad5f",
-  "proxies": [
-    {
-      "path": "/zm",
-      "proxyUrl": "http://server/zm", 
-      "rejectUnauthorized" : false
-    }],
-  "browsers": [
-    {
-      "platform": "android",
-      "browser": "crosswalk",
-      "version": "12.41.296.5"
-    }
-  ],
-  "gulpStartupTasks": [
-    "sass",
-    "watch"
-  ],
-  "watchPatterns": [
-    "www/**/*",
-    "!www/lib/**/*"
-  ]
-}
diff --git a/make_desktop.sh b/make_desktop.sh
index 3fe6fb5a..8f7750a4 100755
--- a/make_desktop.sh
+++ b/make_desktop.sh
@@ -24,7 +24,7 @@ if [ -d "$i" ]; then
 	echo "------------------------------------------------------------------------"
 	exe rm -fr $i/app
 	exe mkdir $i/app
-	exe cp -R www/ $i/app
+	exe cp -R www/* $i/app/
 	exe cp electron_js/* $i/app
 	exe cp www/ZMNINJA-LICENSE-DESKTOP-CLIENT.txt ../$DIRNAME
 	exe cd $i
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index be6aa43b..16b33431 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -987,7 +987,7 @@ angular.module('zmApp.controllers')
                 var apiurl = loginData.apiurl + '/host/getVersion.json';
                 $http.get(apiurl)
                     .then(function (success) {
-                            if (success.data.version) {
+                            if ( success.data.version) {
                                 d.resolve(success.data.version);
                             } else {
                                 d.resolve("0.0.0");
-- 
cgit v1.2.3