mirror of
https://github.com/finos/SymphonyElectron.git
synced 2025-02-25 18:55:29 -06:00
ELECTRON-965: revert the changes (#562)
This commit is contained in:
parent
335f89fa26
commit
608e293a98
@ -70,7 +70,6 @@ const DEFAULT_HEIGHT = 600;
|
||||
|
||||
// Certificate transparency whitelist
|
||||
let ctWhitelist = [];
|
||||
let ignoreAllCertErrors = false;
|
||||
|
||||
/**
|
||||
* Adds a window key
|
||||
@ -343,7 +342,6 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
|
||||
const dialogContent = { type: 'error', title: i18n.getMessageFor('Permission Denied') + '!', message: fullMessage };
|
||||
mainWindow.webContents.send('is-screen-share-enabled', config.permissions.media, dialogContent);
|
||||
}
|
||||
ignoreAllCertErrors = false;
|
||||
});
|
||||
|
||||
mainWindow.webContents.on('did-fail-load', function (event, errorCode,
|
||||
@ -793,28 +791,7 @@ function doCreateMainWindow(initialUrl, initialBounds, isCustomTitleBar) {
|
||||
return callback(0);
|
||||
}
|
||||
|
||||
if (!ignoreAllCertErrors) {
|
||||
const browserWin = electron.BrowserWindow.getFocusedWindow();
|
||||
if (browserWin && !browserWin.isDestroyed()) {
|
||||
const buttonId = electron.dialog.showMessageBox(browserWin, {
|
||||
type: 'warning',
|
||||
buttons: [ 'Allow', 'Deny', 'Ignore All' ],
|
||||
defaultId: 1,
|
||||
cancelId: 1,
|
||||
noLink: true,
|
||||
title: i18n.getMessageFor('Certificate Error'),
|
||||
message: `${i18n.getMessageFor('Certificate Error')}: ${i18n.getMessageFor('Cannot verify Root CA for the hostname')}: ${hostUrl}`,
|
||||
});
|
||||
|
||||
if (buttonId === 2) {
|
||||
ignoreAllCertErrors = true;
|
||||
}
|
||||
|
||||
return callback(buttonId === 1 ? -2 : 0);
|
||||
}
|
||||
return callback(-2);
|
||||
}
|
||||
return callback(0);
|
||||
return callback(-2);
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "Bring All to Front",
|
||||
"Bring to Front on Notifications": "Bring to Front on Notifications",
|
||||
"Certificate Error": "Certificate Error",
|
||||
"Cannot verify Root CA for the hostname": "Cannot verify Root CA for the hostname",
|
||||
"Close": "Close",
|
||||
"Cancel": "Cancel",
|
||||
"ContextMenu": {
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "Bring All to Front",
|
||||
"Bring to Front on Notifications": "Bring to Front on Notifications",
|
||||
"Certificate Error": "Certificate Error",
|
||||
"Cannot verify Root CA for the hostname": "Cannot verify Root CA for the hostname",
|
||||
"Close": "Close",
|
||||
"Cancel": "Cancel",
|
||||
"ContextMenu": {
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "Amener tous au front",
|
||||
"Bring to Front on Notifications": "Mettre les notifications au premier plan",
|
||||
"Certificate Error": "Erreur de certificat",
|
||||
"Cannot verify Root CA for the hostname": "Impossible de vérifier l'autorité de certification racine pour le nom d'hôte",
|
||||
"Close": "Fermer",
|
||||
"Cancel": "Annuler",
|
||||
"ContextMenu": {
|
||||
@ -166,4 +165,4 @@
|
||||
"Zoom": "Zoom",
|
||||
"Zoom In": "Zoom Avant",
|
||||
"Zoom Out": "Zoom Arrière"
|
||||
}
|
||||
}
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "Amener tous au front",
|
||||
"Bring to Front on Notifications": "Mettre les notifications au premier plan",
|
||||
"Certificate Error": "Erreur de certificat",
|
||||
"Cannot verify Root CA for the hostname": "Impossible de vérifier l'autorité de certification racine pour le nom d'hôte",
|
||||
"Close": "Fermer",
|
||||
"Cancel": "Annuler",
|
||||
"ContextMenu": {
|
||||
@ -166,4 +165,4 @@
|
||||
"Zoom": "Zoom",
|
||||
"Zoom In": "Zoom Avant",
|
||||
"Zoom Out": "Zoom Arrière"
|
||||
}
|
||||
}
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "すべて前面に表示",
|
||||
"Bring to Front on Notifications": "通知時に前面に表示",
|
||||
"Certificate Error": "証明書のエラー",
|
||||
"Cannot verify Root CA for the hostname": "ホスト名のルートCAを確認できません",
|
||||
"Close": "閉じる",
|
||||
"Cancel": "キャンセル",
|
||||
"ContextMenu": {
|
||||
@ -45,7 +44,7 @@
|
||||
"Copy": "コピー",
|
||||
"Custom": "カスタム",
|
||||
"Cut": "切り取り",
|
||||
"Delete": "削除",
|
||||
"Delete": "削除",
|
||||
"Disable Hamburger menu": "ハンバーガーメニューを無効にする",
|
||||
"Dev Tools disabled": "開発ツールが無効",
|
||||
"Dev Tools has been disabled! Please contact your system administrator to enable it!": "開発ツールが無効になっています。システム管理者に連絡して、有効にしてください。",
|
||||
|
@ -16,7 +16,6 @@
|
||||
"Bring All to Front": "すべて前面に表示",
|
||||
"Bring to Front on Notifications": "通知時に前面に表示",
|
||||
"Certificate Error": "証明書のエラー",
|
||||
"Cannot verify Root CA for the hostname": "ホスト名のルートCAを確認できません",
|
||||
"Close": "閉じる",
|
||||
"Cancel": "キャンセル",
|
||||
"ContextMenu": {
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "Symphony",
|
||||
"productName": "Symphony",
|
||||
"version": "4.3.1",
|
||||
"version": "4.4.0",
|
||||
"clientVersion": "1.54",
|
||||
"buildNumber": "0",
|
||||
"description": "Symphony desktop app (Foundation ODP)",
|
||||
|
Loading…
Reference in New Issue
Block a user