Skip to content

Commit cad371c

Browse files
implement Electron 4.0.0 support
1 parent f4efad2 commit cad371c

30 files changed

+492
-409
lines changed

ElectronNET.Host/api/app.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/app.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import { nativeImage as NativeImage } from 'electron';
21
let isQuitWindowAllClosed = true;
32

43
export = (socket: SocketIO.Socket, app: Electron.App) => {

ElectronNET.Host/api/browserWindows.js

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/browserWindows.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/browserWindows.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { BrowserWindow, Menu, nativeImage } from "electron";
1+
import { BrowserWindow, Menu, nativeImage } from 'electron';
22
const path = require('path');
3-
const windows: Electron.BrowserWindow[] = []
3+
const windows: Electron.BrowserWindow[] = [];
44
let window, lastOptions;
55

66
export = (socket: SocketIO.Socket, app: Electron.App) => {
@@ -190,8 +190,8 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
190190
lastOptions = options;
191191

192192
window.on('closed', (sender) => {
193-
for (var index = 0; index < windows.length; index++) {
194-
var windowItem = windows[index];
193+
for (let index = 0; index < windows.length; index++) {
194+
const windowItem = windows[index];
195195
try {
196196
windowItem.id;
197197
} catch (error) {
@@ -551,7 +551,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
551551
menu = Menu.buildFromTemplate(menuItems);
552552

553553
addMenuItemClickConnector(menu.items, (id) => {
554-
socket.emit("windowMenuItemClicked", id);
554+
socket.emit('windowMenuItemClicked', id);
555555
});
556556
}
557557

@@ -564,7 +564,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
564564
addMenuItemClickConnector(item.submenu.items, callback);
565565
}
566566

567-
if ("id" in item && item.id) {
567+
if ('id' in item && item.id) {
568568
item.click = () => { callback(item.id); };
569569
}
570570
});
@@ -589,7 +589,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
589589
const imagePath = path.join(__dirname.replace('api', ''), 'bin', thumbarButton.icon.toString());
590590
thumbarButton.icon = nativeImage.createFromPath(imagePath);
591591
thumbarButton.click = () => {
592-
socket.emit("thumbarButtonClicked", thumbarButton["id"]);
592+
socket.emit('thumbarButtonClicked', thumbarButton['id']);
593593
};
594594
});
595595

@@ -674,7 +674,7 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
674674

675675
browserWindows.forEach(x => {
676676
ids.push(x.id);
677-
})
677+
});
678678

679679
socket.emit('browserWindow-getChildWindows-completed', ids);
680680
});
@@ -688,11 +688,11 @@ export = (socket: SocketIO.Socket, app: Electron.App) => {
688688
});
689689

690690
function getWindowById(id: number): Electron.BrowserWindow {
691-
for (var index = 0; index < windows.length; index++) {
692-
var element = windows[index];
691+
for (let index = 0; index < windows.length; index++) {
692+
const element = windows[index];
693693
if (element.id == id) {
694694
return element;
695695
}
696696
}
697697
}
698-
}
698+
};

ElectronNET.Host/api/clipboard.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/clipboard.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { clipboard } from "electron";
1+
import { clipboard } from 'electron';
22

33
export = (socket: SocketIO.Socket) => {
44

@@ -59,4 +59,4 @@ export = (socket: SocketIO.Socket) => {
5959
socket.on('clipboard-write', (data, type) => {
6060
clipboard.write(data, type);
6161
});
62-
}
62+
};

ElectronNET.Host/api/dialog.js

Lines changed: 3 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/dialog.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ElectronNET.Host/api/dialog.ts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
import { BrowserWindow, dialog } from "electron";
1+
import { BrowserWindow, dialog } from 'electron';
22

33
export = (socket: SocketIO.Socket) => {
44
socket.on('showMessageBox', (browserWindow, options, guid) => {
5-
if ("id" in browserWindow) {
6-
var window = BrowserWindow.fromId(browserWindow.id);
5+
if ('id' in browserWindow) {
6+
const window = BrowserWindow.fromId(browserWindow.id);
77

88
dialog.showMessageBox(window, options, (response, checkboxChecked) => {
99
socket.emit('showMessageBoxComplete' + guid, [response, checkboxChecked]);
1010
});
1111
} else {
12-
var message = browserWindow;
13-
let id = guid || options;
12+
const id = guid || options;
1413
dialog.showMessageBox(browserWindow, (response, checkboxChecked) => {
1514
socket.emit('showMessageBoxComplete' + id, [response, checkboxChecked]);
1615
});
1716
}
1817
});
1918

2019
socket.on('showOpenDialog', (browserWindow, options, guid) => {
21-
var window = BrowserWindow.fromId(browserWindow.id);
20+
const window = BrowserWindow.fromId(browserWindow.id);
2221
dialog.showOpenDialog(window, options, (filePaths) => {
2322
socket.emit('showOpenDialogComplete' + guid, filePaths || []);
2423
});
2524
});
2625

2726
socket.on('showSaveDialog', (browserWindow, options, guid) => {
28-
var window = BrowserWindow.fromId(browserWindow.id);
27+
const window = BrowserWindow.fromId(browserWindow.id);
2928
dialog.showSaveDialog(window, options, (filename) => {
3029
socket.emit('showSaveDialogComplete' + guid, filename || '');
3130
});
@@ -36,9 +35,9 @@ export = (socket: SocketIO.Socket) => {
3635
});
3736

3837
socket.on('showCertificateTrustDialog', (browserWindow, options, guid) => {
39-
var window = BrowserWindow.fromId(browserWindow.id);
38+
const window = BrowserWindow.fromId(browserWindow.id);
4039
dialog.showCertificateTrustDialog(window, options, () => {
4140
socket.emit('showCertificateTrustDialogComplete' + guid);
4241
});
4342
});
44-
}
43+
};

0 commit comments

Comments
 (0)