Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const LINUX_INSTALL_DIR = '/opt/betaflight';
var gitChangeSetId;

var nwBuilderOptions = {
version: '0.42.2',
version: '0.44.2',
files: './dist/**/*',
macIcns: './src/images/bf_icon.icns',
macPlist: { 'CFBundleDisplayName': 'Betaflight Configurator'},
Expand Down
28 changes: 14 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,18 +40,18 @@
"node": "10.x"
},
"dependencies": {
"bluebird": "^3.5.5",
"bluebird": "^3.7.2",
"djv": "^2.1.3-alpha.0",
"i18next": "^18.0.1",
"i18next-xhr-backend": "^3.1.1",
"i18next-xhr-backend": "^3.2.2",
"inflection": "1.12.0",
"jbox": "1.0.5",
"jbox": "1.0.8",
"jquery": "3.4.1",
"jquery-textcomplete": "^1.8.5",
"jquery-ui-npm": "1.12.0",
"lru_map": "^0.3.3",
"marked": "^0.7.0",
"object-hash": "^1.3.1",
"marked": "^0.8.0",
"object-hash": "^2.0.3",
"semver-min": "^0.6.5",
"short-unique-id": "^1.1.1",
"universal-ga": "^1.2.0"
Expand All @@ -60,13 +60,13 @@
"chai": "^4.2.0",
"command-exists": "^1.2.8",
"del": "^5.0.0",
"follow-redirects": "^1.6.1",
"follow-redirects": "^1.10.0",
"fs-extra": "^8.1.0",
"gulp": "^4.0.2",
"gulp-concat": "~2.6.1",
"gulp-debian": "~0.1.8",
"gulp-git": "^2.9.0",
"gulp-rename": "^1.4.0",
"gulp-git": "^2.10.0",
"gulp-rename": "^2.0.0",
"gulp-yarn": "^2.0.0",
"gulp-zip": "^5.0.0",
"karma": "^4.0.1",
Expand All @@ -76,15 +76,15 @@
"karma-sinon": "^1.0.5",
"karma-sinon-chai": "^2.0.2",
"karma-tfs-reporter": "^1.0.2",
"makensis": "^0.18.1",
"mocha": "^6.1.4",
"makensis": "^0.20.3",
"mocha": "^7.0.1",
"nw-builder": "^3.5.7",
"os": "^0.1.1",
"rpm-builder": "^1.0.0",
"sinon": "^7.2.3",
"sinon-chai": "^3.3.0",
"rpm-builder": "^1.2.1",
"sinon": "^9.0.0",
"sinon-chai": "^3.5.0",
"targz": "^1.0.1",
"temp": "^0.9.0",
"temp": "^0.9.1",
"vinyl-source-stream": "^2.0.0",
"yarn": "^1.22.0"
},
Expand Down
23 changes: 13 additions & 10 deletions src/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,17 +85,20 @@ function setupAnalytics(result) {
}

if (GUI.isNWJS()) {
const win = GUI.nwGui.Window.get();
win.on('close', function () {
sendCloseEvent();
GUI.nwGui.Window.getAll(function (windows) {
windows.forEach(function (win) {
win.on('close', function () {
sendCloseEvent();

this.close(true);
});
win.on('new-win-policy', function(frame, url, policy) {
// do not open the window
policy.ignore();
// and open it in external browser
GUI.nwGui.Shell.openExternal(url);
this.close(true);
});
win.on('new-win-policy', function(frame, url, policy) {
// do not open the window
policy.ignore();
// and open it in external browser
GUI.nwGui.Shell.openExternal(url);
});
});
});
} else if (!GUI.isOther()) {
// Looks like we're in Chrome - but the event does not actually get fired
Expand Down
Loading