diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-09-11 10:01:56 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-09-11 10:01:56 -0400 |
| commit | 1a1d38813109ade00d6b073556aaad4f443d3f5c (patch) | |
| tree | da9774b404a68bfdb38faf8e18f6540cf7067545 | |
| parent | 91e5270937307e9613e3eb2f3156e084f37b5327 (diff) | |
nits
| -rw-r--r-- | package.json | 48 | ||||
| -rwxr-xr-x | www/js/app.js | 6 |
2 files changed, 25 insertions, 29 deletions
diff --git a/package.json b/package.json index 5d6c70b5..8f653b45 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version":"1.3.018", + "version": "1.3.018", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -118,16 +118,13 @@ "dist-win": "./electron_js/sync_versions.sh && electron-builder -w", "dist-lin": "./electron_js/sync_versions.sh && electron-builder -l", "dist-all": "./electron_js/sync_versions.sh && electron-builder -mwl" - }, "main": "electron_js/main.js", - - "build": { "appId": "com.pliablepixels.zmninjapro", - "productName":"zmninjapro", + "productName": "zmninjapro", "compression": "normal", - "asar":true, + "asar": true, "directories": { "buildResources": "electron_js/icons" }, @@ -145,16 +142,14 @@ "node_modules/menu/**/*", "node_modules/clivas/**/*", "node_modules/keypress/**/*" - ], - - "extraFiles": [ - { - "from":"resources/", + "extraFiles": [ + { + "from": "resources/", "to": "resources/app", "filter": "icon.png" - }], - + } + ], "mac": { "category": "productivity", "target": "dmg", @@ -162,27 +157,28 @@ }, "win": { "icon": "icon.ico", - "target": [{ - "target": "nsis", - "arch": [ - "x64", - "ia32" - ] - }] + "target": [ + { + "target": "nsis", + "arch": [ + "x64", + "ia32" + ] + } + ] }, "linux": { "category": "Utility", - "target": [{ + "target": [ + { "target": "AppImage", - "arch": [ "x64", "ia32", "armv7l" - - ]} - + ] + } ] } } -} +}
\ No newline at end of file diff --git a/www/js/app.js b/www/js/app.js index 42aa1671..e8829520 100755 --- a/www/js/app.js +++ b/www/js/app.js @@ -2052,9 +2052,9 @@ angular.module('zmApp', [ console.log ("FOUND STATE" + JSON.stringify(succ) + ":"+succ); // sanitize this - if (!succ.name || typeof succ.name !== 'string') {succ.name = "app.montage"}; - - if (!succ.params) {succ.params = {}}; + if (!succ.name || typeof succ.name !== 'string') {succ.name = "app.montage";} + + if (!succ.params) {succ.params = {};} if (succ) { if (succ.name == 'app.invalidapi' || succ.name == 'app.refresh' || succ.name == 'app.importantmessage' || succ.name == "app.first-use" || !succ.name) { succ.name = 'app.montage'; |