diff --git a/package-lock.json b/package-lock.json
index 56b5894..641dbee 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "thorium-kiosk",
- "version": "2.0.1",
+ "version": "2.0.4",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -11,15 +11,15 @@
"dev": true
},
"@types/node": {
- "version": "8.10.38",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.38.tgz",
- "integrity": "sha512-EibsnbJerd0hBFaDjJStFrVbVBAtOy4dgL8zZFw0uOvPqzBAX59Ci8cgjg3+RgJIWhsB5A4c+pi+D4P9tQQh/A==",
+ "version": "10.14.5",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-10.14.5.tgz",
+ "integrity": "sha512-Ja7d4s0qyGFxjGeDq5S7Si25OFibSAHUi6i17UWnwNnpitADN7hah9q0Tl25gxuV5R1u2Bx+np6w4LHXfHyj/g==",
"dev": true
},
"ajv": {
- "version": "6.5.5",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.5.tgz",
- "integrity": "sha512-7q7gtRQDJSyuEHjuVgHoUa2VuemFiCMrfQc9Tc08XTAc4Zj/5U1buQJ0HU6i7fKjXU09SVgSmxa4sLvuvS8Iyg==",
+ "version": "6.10.0",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
+ "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
"dev": true,
"requires": {
"fast-deep-equal": "^2.0.1",
@@ -92,40 +92,40 @@
}
},
"app-builder-bin": {
- "version": "2.6.4",
- "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.4.tgz",
- "integrity": "sha512-wC9HYqiC1XqpunT/9y2VuF90KbarnIHL90Tv8BD3TITTgbVIdRTXAsvWvmaR/ImvAX0+l5Z3jZtXjdJ7Pw3bLQ==",
+ "version": "2.6.6",
+ "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-2.6.6.tgz",
+ "integrity": "sha512-G0Ee6xkbxV+fvM/7xXWIgSDjWAD4E/d/aNbxerq/TVsCyBIau/0VPmrEqBMyZv0NbTwLDW5aF/yHG+0ZEY77kA==",
"dev": true
},
"app-builder-lib": {
- "version": "20.39.0",
- "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.39.0.tgz",
- "integrity": "sha512-lkxGyBrQwueYb3ViqHt5WjyzVVBQqXMXc7TF+JqkuuUWp5DF7SXAYZYd+rsR3gmCbdNxw4SPIEmWmm+I9LK2gw==",
+ "version": "20.40.2",
+ "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-20.40.2.tgz",
+ "integrity": "sha512-SAbfua8+L3pFbQp3QFpKV0PzHJPJqepROeX/FPrfdL02zxlw+BVOe6KfC3+UV6XUombWvVPG+SwG956vfIx/Cw==",
"dev": true,
"requires": {
"7zip-bin": "~4.1.0",
- "app-builder-bin": "2.6.4",
+ "app-builder-bin": "2.6.6",
"async-exit-hook": "^2.0.1",
"bluebird-lst": "^1.0.7",
- "builder-util": "9.7.0",
- "builder-util-runtime": "8.2.0",
+ "builder-util": "9.7.1",
+ "builder-util-runtime": "8.2.1",
"chromium-pickle-js": "^0.2.0",
"debug": "^4.1.1",
"ejs": "^2.6.1",
"electron-osx-sign": "0.4.11",
- "electron-publish": "20.39.0",
+ "electron-publish": "20.40.0",
"fs-extra-p": "^7.0.1",
"hosted-git-info": "^2.7.1",
"is-ci": "^2.0.0",
"isbinaryfile": "^4.0.0",
- "js-yaml": "^3.12.1",
+ "js-yaml": "^3.13.0",
"lazy-val": "^1.0.4",
"minimatch": "^3.0.4",
"normalize-package-data": "^2.5.0",
"plist": "^3.0.1",
"read-config-file": "3.2.2",
"sanitize-filename": "^1.6.1",
- "semver": "^5.6.0",
+ "semver": "^6.0.0",
"temp-file": "^3.3.2"
},
"dependencies": {
@@ -139,9 +139,9 @@
}
},
"builder-util-runtime": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
- "integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+ "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.7",
@@ -180,22 +180,6 @@
"fs-extra": "^7.0.1"
}
},
- "js-yaml": {
- "version": "3.12.2",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
- "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
- "dev": true,
- "requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- }
- },
- "lazy-val": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
- "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
- "dev": true
- },
"normalize-package-data": {
"version": "2.5.0",
"resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
@@ -206,7 +190,21 @@
"resolve": "^1.10.0",
"semver": "2 || 3 || 4 || 5",
"validate-npm-package-license": "^3.0.1"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+ "dev": true
+ }
}
+ },
+ "semver": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+ "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+ "dev": true
}
}
},
@@ -411,22 +409,22 @@
"integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g=="
},
"builder-util": {
- "version": "9.7.0",
- "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.0.tgz",
- "integrity": "sha512-QA2RxbaSKvaFVNGcYsjmlkTn03tcdPxgIxHCOgw38G7NK91QWc76RBY9+T1sU8BLVEZJ4qNRWx+pd5rG9tTi+Q==",
+ "version": "9.7.1",
+ "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-9.7.1.tgz",
+ "integrity": "sha512-txpzYIeuHFjrOQWPTJDvhJYisIVGJdSG9ppccE+y7agT0YNhBlVHGnd8+HgFTajYE34xzB5zf1/zxiiDqSKSpA==",
"dev": true,
"requires": {
"7zip-bin": "~4.1.0",
- "app-builder-bin": "2.6.4",
+ "app-builder-bin": "2.6.6",
"bluebird-lst": "^1.0.7",
- "builder-util-runtime": "^8.2.0",
+ "builder-util-runtime": "^8.2.1",
"chalk": "^2.4.2",
"debug": "^4.1.1",
"fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0",
- "js-yaml": "^3.12.1",
- "source-map-support": "^0.5.10",
- "stat-mode": "^0.2.2",
+ "js-yaml": "^3.13.0",
+ "source-map-support": "^0.5.11",
+ "stat-mode": "^0.3.0",
"temp-file": "^3.3.2"
},
"dependencies": {
@@ -440,9 +438,9 @@
}
},
"builder-util-runtime": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
- "integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+ "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.7",
@@ -480,44 +478,24 @@
"bluebird-lst": "^1.0.7",
"fs-extra": "^7.0.1"
}
- },
- "js-yaml": {
- "version": "3.12.2",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
- "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
- "dev": true,
- "requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- }
- },
- "source-map-support": {
- "version": "0.5.11",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.11.tgz",
- "integrity": "sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==",
- "dev": true,
- "requires": {
- "buffer-from": "^1.0.0",
- "source-map": "^0.6.0"
- }
}
}
},
"builder-util-runtime": {
- "version": "8.0.2",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.0.2.tgz",
- "integrity": "sha512-46AjyMQ1/yBvGnXWmqNGlg8te7jCPCs7TJ0zDC2+4vV/t5iZp2dR1H9UfVpcBxlvBq3dlAOmwb9fz1d9xZN1+Q==",
+ "version": "8.1.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.1.1.tgz",
+ "integrity": "sha512-+ieS4PMB33vVE2S3ZNWBEQJ1zKmAs/agrBdh7XadE1lKLjrH4aXYuOh9OOGdxqIRldhlhNBaF+yKMMEFOdNVig==",
"requires": {
"bluebird-lst": "^1.0.6",
- "debug": "^4.1.0",
+ "debug": "^4.1.1",
"fs-extra-p": "^7.0.0",
"sax": "^1.2.4"
},
"dependencies": {
"debug": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.0.tgz",
- "integrity": "sha512-heNPJUJIqC+xB6ayLAMHaIrmN9HKa7aQO8MGqKpvCA+uJYVcvR6l5kgdrhRuwPFHU7P5/A1w0BjByPHwpfTDKg==",
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
"requires": {
"ms": "^2.1.1"
}
@@ -814,17 +792,17 @@
"dev": true
},
"dmg-builder": {
- "version": "6.6.0",
- "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.0.tgz",
- "integrity": "sha512-voodd3qdpdRiaciFZTfrFq/e82UPmUqSJq6R3Wc2Ql6XqXYLQcKo1h9rSZiivwls8PqE4Mk1IHTIOwmvJaq+MA==",
+ "version": "6.6.1",
+ "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-6.6.1.tgz",
+ "integrity": "sha512-aIbpQG3es+gHTFtsBQE4fmSYVM60yewxJZsN6FhkAmAmNaoO45bEQNJZsRX0YE49+imiSC92mJmFAEP6iKE0Tg==",
"dev": true,
"requires": {
- "app-builder-lib": "~20.39.0",
+ "app-builder-lib": "~20.40.0",
"bluebird-lst": "^1.0.7",
- "builder-util": "~9.7.0",
+ "builder-util": "~9.7.1",
"fs-extra-p": "^7.0.1",
"iconv-lite": "^0.4.24",
- "js-yaml": "^3.12.1",
+ "js-yaml": "^3.13.0",
"parse-color": "^1.0.0",
"sanitize-filename": "^1.6.1"
},
@@ -858,16 +836,6 @@
"bluebird-lst": "^1.0.7",
"fs-extra": "^7.0.1"
}
- },
- "js-yaml": {
- "version": "3.12.2",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
- "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
- "dev": true,
- "requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- }
}
}
},
@@ -937,35 +905,35 @@
"dev": true
},
"electron": {
- "version": "3.0.10",
- "resolved": "https://registry.npmjs.org/electron/-/electron-3.0.10.tgz",
- "integrity": "sha512-I39IeQP3NOlbjKzTDK8uK2JdiHDfhV5SruCS2Gttkn2MaKCY+yIzQ6Wr4DyBXLeTEkL1sbZxbqQVhCavAliv5w==",
+ "version": "4.1.4",
+ "resolved": "https://registry.npmjs.org/electron/-/electron-4.1.4.tgz",
+ "integrity": "sha512-MelOjntJvd33izEjR6H4N/Uii7y535z/b2BuYXJGLNSHL6o1IlyhUQmfiT87kWABayERgeuYERgvsyf956OOFw==",
"dev": true,
"requires": {
- "@types/node": "^8.0.24",
+ "@types/node": "^10.12.18",
"electron-download": "^4.1.0",
"extract-zip": "^1.0.3"
}
},
"electron-builder": {
- "version": "20.39.0",
- "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.39.0.tgz",
- "integrity": "sha512-50SNZ/G+iE9MpTwxzeHt1Cqg8jZKeFLuJ9wubR4e/8VIzAe0ERUmwAQw+77UrlwXZD/PKKoYblc0Sr08Vm4exg==",
+ "version": "20.40.2",
+ "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-20.40.2.tgz",
+ "integrity": "sha512-hnnBzyLXna+WpmT4MIoWVdRli43q09yqKOgzPJj0KrOoJZ7TIoY1aYSPvSg8VL5rSuTgdAWGL4rYd9zcq3YXMQ==",
"dev": true,
"requires": {
- "app-builder-lib": "20.39.0",
+ "app-builder-lib": "20.40.2",
"bluebird-lst": "^1.0.7",
- "builder-util": "9.7.0",
- "builder-util-runtime": "8.2.0",
+ "builder-util": "9.7.1",
+ "builder-util-runtime": "8.2.1",
"chalk": "^2.4.2",
- "dmg-builder": "6.6.0",
+ "dmg-builder": "6.6.1",
"fs-extra-p": "^7.0.1",
"is-ci": "^2.0.0",
"lazy-val": "^1.0.4",
"read-config-file": "3.2.2",
"sanitize-filename": "^1.6.1",
"update-notifier": "^2.5.0",
- "yargs": "^13.2.1"
+ "yargs": "^13.2.2"
},
"dependencies": {
"bluebird-lst": {
@@ -978,9 +946,9 @@
}
},
"builder-util-runtime": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
- "integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+ "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.7",
@@ -1018,12 +986,6 @@
"bluebird-lst": "^1.0.7",
"fs-extra": "^7.0.1"
}
- },
- "lazy-val": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
- "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
- "dev": true
}
}
},
@@ -1085,18 +1047,18 @@
}
},
"electron-publish": {
- "version": "20.39.0",
- "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.39.0.tgz",
- "integrity": "sha512-PWrGUru994CSmtsA56GnjyLB3EnIS3zyEmrW0hDXtwuctZLGMnrxjK/7WEORYkgTQ/GufD5b/8T05Q2Kr42nqQ==",
+ "version": "20.40.0",
+ "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-20.40.0.tgz",
+ "integrity": "sha512-mkjtsIgftRszuT/8do8TszmddokDnu254OyTeL8nE780o/A8t68oXHZzvlTJ4AQ8uBOYrA87JDO/BFCWjnVArA==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.7",
- "builder-util": "~9.7.0",
- "builder-util-runtime": "^8.2.0",
+ "builder-util": "~9.7.1",
+ "builder-util-runtime": "^8.2.1",
"chalk": "^2.4.2",
"fs-extra-p": "^7.0.1",
"lazy-val": "^1.0.4",
- "mime": "^2.4.0"
+ "mime": "^2.4.1"
},
"dependencies": {
"bluebird-lst": {
@@ -1109,9 +1071,9 @@
}
},
"builder-util-runtime": {
- "version": "8.2.0",
- "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.0.tgz",
- "integrity": "sha512-2Q3YrxANTrDs2NjSG5mbNGLPuUhPnSNYF9w5i4jWfHcNfQ3TgRrGXq4UfnkCiZVX8Axp4eAOSscaLLScKp/XLg==",
+ "version": "8.2.1",
+ "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-8.2.1.tgz",
+ "integrity": "sha512-2TkeTcI9bDlK5azRZSJJNxhAgW1DK+JY3jHK0UWPxgJcan4GZSVDNNO3sXntNxrp+JAdPHMF14rzNd/G53lvqw==",
"dev": true,
"requires": {
"bluebird-lst": "^1.0.7",
@@ -1149,12 +1111,6 @@
"bluebird-lst": "^1.0.7",
"fs-extra": "^7.0.1"
}
- },
- "lazy-val": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
- "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
- "dev": true
}
}
},
@@ -1168,17 +1124,17 @@
}
},
"electron-updater": {
- "version": "4.0.4",
- "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.0.4.tgz",
- "integrity": "sha512-y3wddJQyC5h1UTJhNAWoX4McJ5Z1r1ZDqyifpYWniVS286YCXe1xSLkbe9C6ZzxzPurt1jg2ZubPuBNt/811Dw==",
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/electron-updater/-/electron-updater-4.0.6.tgz",
+ "integrity": "sha512-JPGLME6fxJcHG8hX7HWFl6Aew6iVm0DkcrENreKa5SUJCHG+uUaAhxDGDt+YGcNkyx1uJ6eBGMvFxDTLUv67pg==",
"requires": {
"bluebird-lst": "^1.0.6",
- "builder-util-runtime": "~8.0.2",
+ "builder-util-runtime": "~8.1.0",
"fs-extra-p": "^7.0.0",
"js-yaml": "^3.12.0",
"lazy-val": "^1.0.3",
"lodash.isequal": "^4.5.0",
- "pako": "^1.0.6",
+ "pako": "^1.0.7",
"semver": "^5.6.0",
"source-map-support": "^0.5.9"
}
@@ -1656,9 +1612,9 @@
"dev": true
},
"js-yaml": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
- "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
@@ -1727,9 +1683,9 @@
}
},
"lazy-val": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.3.tgz",
- "integrity": "sha512-pjCf3BYk+uv3ZcPzEVM0BFvO9Uw58TmlrU0oG5tTrr9Kcid3+kdKxapH8CjdYmVa2nO5wOoZn2rdvZx2PKj/xg=="
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
+ "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q=="
},
"lcid": {
"version": "2.0.0",
@@ -1824,9 +1780,9 @@
"integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0="
},
"mem": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/mem/-/mem-4.2.0.tgz",
- "integrity": "sha512-5fJxa68urlY0Ir8ijatKa3eRz5lwXnRCTvo9+TbTGAuTFJOwpGcY0X05moBd0nW45965Njt4CDI2GFQoG8DvqA==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
"dev": true,
"requires": {
"map-age-cleaner": "^0.1.1",
@@ -1852,30 +1808,30 @@
}
},
"mime": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
- "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+ "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
"dev": true
},
"mime-db": {
- "version": "1.37.0",
- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.37.0.tgz",
- "integrity": "sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.39.0.tgz",
+ "integrity": "sha512-DTsrw/iWVvwHH+9Otxccdyy0Tgiil6TWK/xhfARJZF/QFhwOgZgOIvA2/VIGpM8U7Q8z5nDmdDWC6tuVMJNibw==",
"dev": true
},
"mime-types": {
- "version": "2.1.21",
- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.21.tgz",
- "integrity": "sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==",
+ "version": "2.1.23",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.23.tgz",
+ "integrity": "sha512-ROk/m+gMVSrRxTkMlaQOvFmFmYDc7sZgrjjM76abqmd2Cc5fCV7jAMA5XUccEtJ3cYiYdgixUVI+fApc2LkXlw==",
"dev": true,
"requires": {
- "mime-db": "~1.37.0"
+ "mime-db": "~1.39.0"
}
},
"mimic-fn": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.0.0.tgz",
- "integrity": "sha512-jbex9Yd/3lmICXwYT6gA/j2mNQGU48wCh/VzRd+/Y/PjYQtlg1gLMdZqvu9s/xH7qKvngxRObl56XZR609IMbA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
"dev": true
},
"minimatch": {
@@ -2064,16 +2020,6 @@
"requires": {
"pump": "^3.0.0"
}
- },
- "pump": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
- "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
- "dev": true,
- "requires": {
- "end-of-stream": "^1.1.0",
- "once": "^1.3.1"
- }
}
}
},
@@ -2090,9 +2036,9 @@
"dev": true
},
"p-is-promise": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.0.0.tgz",
- "integrity": "sha512-pzQPhYMCAgLAKPWD2jC3Se9fEfrD9npNos0y150EeqZll7akhEgGhTW/slB6lHku8AvYGiJ+YJ5hfHKePPgFWg==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
"dev": true
},
"p-limit": {
@@ -2114,9 +2060,9 @@
}
},
"p-try": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.0.0.tgz",
- "integrity": "sha512-hMp0onDKIajHfIkdRk3P4CdCmErkYAxxDtP3Wx/4nZ3aGlau2VKh3mZpcuFkH27WQkL/3WBCPOktzA9ZOAnMQQ==",
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
"package-json": {
@@ -2132,9 +2078,9 @@
}
},
"pako": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
- "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+ "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw=="
},
"parse-color": {
"version": "1.0.0",
@@ -2286,11 +2232,21 @@
"dev": true
},
"psl": {
- "version": "1.1.29",
- "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.29.tgz",
- "integrity": "sha512-AeUmQ0oLN02flVHXWh9sSJF7mcdFq0ppid/JkErufc3hGIV/AMa8Fo9VgDo/cT2jFdOWoFvHp90qqBH54W+gjQ==",
+ "version": "1.1.31",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.1.31.tgz",
+ "integrity": "sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==",
"dev": true
},
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "^1.1.0",
+ "once": "^1.3.1"
+ }
+ },
"punycode": {
"version": "2.1.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
@@ -2332,18 +2288,6 @@
"lazy-val": "^1.0.4"
},
"dependencies": {
- "ajv": {
- "version": "6.10.0",
- "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.0.tgz",
- "integrity": "sha512-nffhOpkymDECQyR0mnsUtoCE8RlX38G0rYP+wgLWFyZuUyuuojSSvi/+euOiQBIn63whYwYVIIH1TvE3tu4OEg==",
- "dev": true,
- "requires": {
- "fast-deep-equal": "^2.0.1",
- "fast-json-stable-stringify": "^2.0.0",
- "json-schema-traverse": "^0.4.1",
- "uri-js": "^4.2.2"
- }
- },
"bluebird-lst": {
"version": "1.0.7",
"resolved": "https://registry.npmjs.org/bluebird-lst/-/bluebird-lst-1.0.7.tgz",
@@ -2373,22 +2317,6 @@
"bluebird-lst": "^1.0.7",
"fs-extra": "^7.0.1"
}
- },
- "js-yaml": {
- "version": "3.12.2",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.2.tgz",
- "integrity": "sha512-QHn/Lh/7HhZ/Twc7vJYQTkjuCa0kaCcDcjK5Zlk2rvnUpy7DxMJ23+Jc2dcyvltwQVg1nygAVlB2oRDFHoRS5Q==",
- "dev": true,
- "requires": {
- "argparse": "^1.0.7",
- "esprima": "^4.0.0"
- }
- },
- "lazy-val": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/lazy-val/-/lazy-val-1.0.4.tgz",
- "integrity": "sha512-u93kb2fPbIrfzBuLjZE+w+fJbUUMhNDXxNmMfaqNgpfQf1CO5ZSe2LfsnBqVAk7i/2NF48OSoRj+Xe2VT+lE8Q==",
- "dev": true
}
}
},
@@ -2433,9 +2361,9 @@
}
},
"registry-auth-token": {
- "version": "3.3.2",
- "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
- "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz",
+ "integrity": "sha512-4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==",
"dev": true,
"requires": {
"rc": "^1.1.6",
@@ -2606,9 +2534,9 @@
"integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
},
"source-map-support": {
- "version": "0.5.9",
- "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.9.tgz",
- "integrity": "sha512-gR6Rw4MvUlYy83vP0vxoVNzM6t8MUXqNuRsuBmBHQDu1Fh6X015FrLdgoDKcNdkwGubozq0P4N0Q37UyFVr1EA==",
+ "version": "0.5.12",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.12.tgz",
+ "integrity": "sha512-4h2Pbvyy15EE02G+JOZpUCmqWJuqrs+sEkzewTm++BPi7Hvn/HwcqLAcNxYAyI0x13CpPPn+kMjl+hplXMHITQ==",
"requires": {
"buffer-from": "^1.0.0",
"source-map": "^0.6.0"
@@ -2654,9 +2582,9 @@
"integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw="
},
"sshpk": {
- "version": "1.15.2",
- "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.15.2.tgz",
- "integrity": "sha512-Ra/OXQtuh0/enyl4ETZAfTaeksa6BXks5ZcjpSUNrjBr0DvrJKX+1fsKDPpT9TBXgHAFsa4510aNVgI8g/+SzA==",
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
"dev": true,
"requires": {
"asn1": "~0.2.3",
@@ -2671,9 +2599,9 @@
}
},
"stat-mode": {
- "version": "0.2.2",
- "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz",
- "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=",
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.3.0.tgz",
+ "integrity": "sha512-QjMLR0A3WwFY2aZdV0okfFEJB5TRjkggXZjxP3A1RsWsNHNu3YPv8btmtc6iCFZ0Rul3FE93OYogvhOUClU+ng==",
"dev": true
},
"string-width": {
@@ -3150,9 +3078,9 @@
}
},
"strip-ansi": {
- "version": "5.1.0",
- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.1.0.tgz",
- "integrity": "sha512-TjxrkPONqO2Z8QDCpeE2j6n0M6EwxzyDgzEeGp+FbdvaJAt//ClYi6W5my+3ROlC/hZX2KACUwDfK49Ka5eDvg==",
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
"dev": true,
"requires": {
"ansi-regex": "^4.1.0"
@@ -3171,9 +3099,9 @@
},
"dependencies": {
"camelcase": {
- "version": "5.2.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.2.0.tgz",
- "integrity": "sha512-IXFsBS2pC+X0j0N/GE7Dm7j3bsEBp+oTpb7F50dwEVX7rf3IgwO9XatnegTsDtniKCUtEJH4fSU6Asw7uoVLfQ==",
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
"dev": true
}
}
diff --git a/package.json b/package.json
index 95f4a22..de0684c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "thorium-kiosk",
- "version": "2.0.1",
+ "version": "2.0.6",
"description": "A client application for Thorium",
"main": "src/index.js",
"scripts": {
@@ -8,7 +8,8 @@
"start": "electron .",
"pack": "electron-builder -mwl",
"dist": "electron-builder -mwl -p always",
- "postinstall": "electron-builder install-app-deps"
+ "postinstall": "electron-builder install-app-deps && npm run rebuild",
+ "rebuild": "npm rebuild --runtime=electron --target=4.1.4 --disturl=https://atom.io/download/atom-shell --abi=69"
},
"repository": {
"type": "git",
@@ -24,8 +25,8 @@
},
"homepage": "https://github.com/Thorium-Sim/thorium-kiosk#readme",
"devDependencies": {
- "electron": "^3.0.10",
- "electron-builder": "^20.39.0"
+ "electron": "^4.1.4",
+ "electron-builder": "^20.40.2"
},
"build": {
"appId": "us.fyreworks.thorium",
@@ -52,7 +53,7 @@
"dependencies": {
"bonjour": "^3.5.0",
"electron-settings": "^3.2.0",
- "electron-updater": "^4.0.4",
+ "electron-updater": "^4.0.6",
"power-off": "^1.1.2",
"sleep-mode": "^1.1.0",
"uuid": "^3.3.2"
diff --git a/src/helpers/freakout.js b/src/helpers/freakout.js
index fe0a444..23888cb 100644
--- a/src/helpers/freakout.js
+++ b/src/helpers/freakout.js
@@ -1,15 +1,14 @@
// var robot = require("robotjs");
// //console.log(process.version);
// module.exports = function() {
-// // Speed up the mouse.
-// robot.setMouseDelay(2);
-
-// var twoPI = Math.PI * 2.0;
// var screenSize = robot.getScreenSize();
// var height = screenSize.height;
// var width = screenSize.width;
// var counter = 0;
+// // Speed up the mouse.
+// robot.setMouseDelay(2);
+
// moveMouse();
// function moveMouse() {
// counter++;
diff --git a/src/helpers/hotkeys.js b/src/helpers/hotkeys.js
index 187208b..bb8aab7 100644
--- a/src/helpers/hotkeys.js
+++ b/src/helpers/hotkeys.js
@@ -1,5 +1,6 @@
const { app, globalShortcut, BrowserWindow } = require("electron");
const { windows } = require("./multiWindow");
+const { clearMenubar, setMenubar } = require("./setMenubar");
module.exports = () => {
// Create the browser window.
@@ -8,15 +9,15 @@ module.exports = () => {
mainWindow.webContents.openDevTools();
});
- globalShortcut.register("CommandOrControl+Q", function() {
- // Do nothing.
- });
+ // globalShortcut.register("CommandOrControl+Q", function() {
+ // // Do nothing.
+ // });
- globalShortcut.register("CommandOrControl+W", function() {
- // Do nothing.
- });
+ // globalShortcut.register("CommandOrControl+W", function() {
+ // // Do nothing.
+ // });
- globalShortcut.register("CommandOrControl+R", function() {
+ globalShortcut.register("CommandOrControl+Alt+R", function() {
windows.forEach(mainWindow => {
mainWindow && mainWindow.reload();
});
@@ -31,9 +32,11 @@ module.exports = () => {
windows.forEach(mainWindow => {
mainWindow.setKiosk(false);
});
+ setMenubar();
} else {
windows.forEach(mainWindow => {
mainWindow.setKiosk(true);
+ clearMenubar();
});
}
});
diff --git a/src/helpers/loadPage.js b/src/helpers/loadPage.js
index 8b9c163..02d2c97 100644
--- a/src/helpers/loadPage.js
+++ b/src/helpers/loadPage.js
@@ -4,7 +4,7 @@ const { clearMenubar, setMenubar } = require("./setMenubar");
const { windows } = require("./multiWindow");
const { setLoadedUrl } = require("./loadedUrl");
-module.exports = function loadPage(uri) {
+module.exports = function loadPage(uri, kiosk) {
return new Promise((resolve, reject) => {
const url = uri
.replace("https://", "")
@@ -12,17 +12,18 @@ module.exports = function loadPage(uri) {
.replace("/client", "");
http
.get(`http://${url}/client`, res => {
- if (res.statusCode !== 200) {
- setMenubar();
- return reject();
- }
+ // if (res.statusCode !== 200) {
+ // setMenubar();
+ // return reject();
+ // }
setLoadedUrl(`http://${url}/client`);
windows.forEach(mainWindow => {
mainWindow && mainWindow.loadURL(`http://${url}/client`);
- triggerWindow(mainWindow);
+ triggerWindow(mainWindow, kiosk);
});
-
- clearMenubar();
+ if (kiosk) {
+ clearMenubar();
+ }
return resolve();
})
.on("error", e => {
diff --git a/src/helpers/menuTemplate.js b/src/helpers/menuTemplate.js
index 6a222b0..d1a18ed 100644
--- a/src/helpers/menuTemplate.js
+++ b/src/helpers/menuTemplate.js
@@ -1,6 +1,7 @@
const { BrowserWindow, app } = require("electron");
const { windows, addWindow } = require("./multiWindow");
const { getLoadedUrl } = require("./loadedUrl");
+const { clearMenubar, setMenubar } = require("./setMenubar");
module.exports = function() {
var template = [
@@ -11,6 +12,18 @@ module.exports = function() {
label: "About Application",
selector: "orderFrontStandardAboutPanel:"
},
+ {
+ label: "Quit",
+ accelerator: "CmdOrCtrl+Alt+Q",
+ click: function() {
+ app.quit();
+ }
+ }
+ ]
+ },
+ {
+ label: "File",
+ submenu: [
{
label: "New Window",
accelerator: "CmdOrCtrl+N",
@@ -35,10 +48,12 @@ module.exports = function() {
if (windows[0] && windows[0].isKiosk()) {
windows.forEach(mainWindow => {
mainWindow.setKiosk(false);
+ setMenubar();
});
} else {
windows.forEach(mainWindow => {
mainWindow.setKiosk(true);
+ clearMenubar();
});
}
}
@@ -50,13 +65,6 @@ module.exports = function() {
const focused = BrowserWindow.getFocusedWindow();
focused && focused.webContents.openDevTools();
}
- },
- {
- label: "Quit",
- accelerator: "CmdOrCtrl+Alt+Q",
- click: function() {
- app.quit();
- }
}
]
},
diff --git a/src/helpers/multiWindow.js b/src/helpers/multiWindow.js
index 4951f6b..225524c 100644
--- a/src/helpers/multiWindow.js
+++ b/src/helpers/multiWindow.js
@@ -28,7 +28,7 @@ function addWindow({ main, x, y, loadedUrl }) {
const config = {
backgroundColor: "#2e2c29",
width: 800,
- height: 600,
+ height: 700,
x,
y,
kiosk: false,
diff --git a/src/helpers/preload.js b/src/helpers/preload.js
index a2c5089..1f9fe05 100644
--- a/src/helpers/preload.js
+++ b/src/helpers/preload.js
@@ -42,10 +42,20 @@ function getClientList() {
return clientList;
}
+document.addEventListener("DOMContentLoaded", function() {
+ if (localStorage.getItem("thorium_startKiosked") !== "false") {
+ if (document.getElementById("start-kiosked")) {
+ document.getElementById("start-kiosked").checked = true;
+ }
+ }
+});
+
window.loadPage = function loadPage(url) {
let auto = false;
if (document.getElementById("remember-client").checked) auto = true;
- ipcRenderer.send("loadPage", { url, auto });
+ let kiosk = document.getElementById("start-kiosked").checked;
+ localStorage.setItem("thorium_startKiosked", kiosk);
+ ipcRenderer.send("loadPage", { url, auto, kiosk });
return;
};
window.openBrowser = function openBrowser() {
diff --git a/src/helpers/setMenubar.js b/src/helpers/setMenubar.js
index 927f3fc..f209881 100644
--- a/src/helpers/setMenubar.js
+++ b/src/helpers/setMenubar.js
@@ -1,9 +1,14 @@
const { Menu } = require("electron");
const templateFunc = require("./menuTemplate");
+const { windows } = require("./multiWindow");
module.exports.setMenubar = function setMenubar() {
const template = templateFunc();
Menu.setApplicationMenu(Menu.buildFromTemplate(template));
+ windows.forEach(w => {
+ w.setMenuBarVisibility(true);
+ w.setAutoHideMenuBar(false);
+ });
};
module.exports.clearMenubar = function clearMenubar() {
diff --git a/src/helpers/startApp.js b/src/helpers/startApp.js
index a69343b..d1362a7 100644
--- a/src/helpers/startApp.js
+++ b/src/helpers/startApp.js
@@ -22,11 +22,11 @@ module.exports = () => {
}).length;
});
ipcMain.on("loadPage", function(evt, data) {
- const { url: loadUrl, auto } = data;
+ const { url: loadUrl, auto, kiosk } = data;
if (auto) {
settings.set("autostart", loadUrl);
}
- loadPage(loadUrl).catch(() => {
+ loadPage(loadUrl, kiosk).catch(() => {
settings.set("autostart", null);
bonjour.start();
});
@@ -35,7 +35,7 @@ module.exports = () => {
// Check to see if the page will work.
const loadUrl = settings.get("autostart");
// Do a fetch
- loadPage(loadUrl).catch(() => {
+ loadPage(loadUrl, true).catch(() => {
settings.set("autostart", null);
bonjour.start();
});
diff --git a/src/helpers/triggerWindow.js b/src/helpers/triggerWindow.js
index 24f7678..43fac33 100644
--- a/src/helpers/triggerWindow.js
+++ b/src/helpers/triggerWindow.js
@@ -2,9 +2,11 @@ const initHotkeys = require("./hotkeys");
const initRemote = require("./remote");
const { app } = require("electron");
-module.exports = function triggerWindow(mainWindow) {
- mainWindow.setKiosk(true);
- initHotkeys();
+module.exports = function triggerWindow(mainWindow, kiosk) {
+ if (kiosk) {
+ mainWindow.setKiosk(true);
+ initHotkeys();
+ }
initRemote();
mainWindow.on("closed", function() {
diff --git a/src/index.html b/src/index.html
index 3dba385..6a150c5 100644
--- a/src/index.html
+++ b/src/index.html
@@ -79,6 +79,11 @@
padding: 5px 10px;
width: 100%;
}
+ input[type="checkbox"] {
+ float: left;
+ width: auto;
+ margin: 3px 0.5ex;
+ }
@@ -354,8 +359,8 @@ Select a server:
+ server on Open
+
Make sure your server is on before starting the client.Select a server:
Connect to Server
+