summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2017-09-25 11:00:03 -0400
committerPliable Pixels <pliablepixels@gmail.com>2017-09-25 11:00:03 -0400
commit9006a2d713279f4b624df2d94055a591112b055b (patch)
treea33fe01d2bc30d416177727f08f53edf0bf0d6ff
parentab96cb8fcf328d095d8b8e65d40e02c68d6d8d11 (diff)
updated electron #539 and also added exception catch to see if it works in main.js
-rw-r--r--electron_js/main.js4
-rwxr-xr-xmake_desktop.sh2
-rw-r--r--package.json6
3 files changed, 6 insertions, 6 deletions
diff --git a/electron_js/main.js b/electron_js/main.js
index 7aae0ea0..5493f823 100644
--- a/electron_js/main.js
+++ b/electron_js/main.js
@@ -106,6 +106,10 @@ app.on('activate', () => {
}
});
+app.on('uncaughtException', function (err) {
+ console.log("***WHOOPS TIME****"+err);
+})
+
app.on('will-quit', () => {
// Unregister all shortcuts.
globalShortcut.unregisterAll()
diff --git a/make_desktop.sh b/make_desktop.sh
index b3d6e4e5..e6a3c21d 100755
--- a/make_desktop.sh
+++ b/make_desktop.sh
@@ -9,7 +9,7 @@ APPVER=`cat config.xml | grep "widget " | sed 's/.* version=\"\([^\"]*\)\" xmlns
APPVER+="D"
echo "Application version:$APPVER"
-declare -a app_ports=("../zmNinja-mac.app/Contents/Resources" "../zmNinja-linux32bit/resources" "../zmNinja-linux64bit/resources" "../zmNinja-win64bit/resources" "../zmNinja-win32bit/resources" "../zmNinja-linuxarm/resources")
+declare -a app_ports=("../zmNinja-mac.app/Contents/Resources" "../zmNinja-linux32bit/resources" "../zmNinja-linux64bit/resources" "../zmNinja-win32-64bit/resources" "../zmNinja-linuxarm/resources")
for i in "${app_ports[@]}"
do
diff --git a/package.json b/package.json
index 5a61b8a3..741f50c2 100644
--- a/package.json
+++ b/package.json
@@ -103,10 +103,6 @@
"id": "cordova-plugin-globalization"
},
"cordova-plugin-console",
- {
- "locator": "https://github.com/jcjee/email-composer",
- "id": "com.jcjee.plugins.emailcomposer"
- },
"cordova-plugin-app-version",
"cordova-plugin-android-permissions",
"cordova-plugin-network-information",
@@ -220,4 +216,4 @@
}
}
}
-} \ No newline at end of file
+}