if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2025-02-25 18:55:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.x' of github.com:symphonyoss/SymphonyElectron into 3.x

Browse Source
This commit is contained in:
Vishwas Shashidhar
2019-05-07 11:02:31 +05:30
parent b52fb4027f dd07b05ecb
commit 2b69787667
2 changed files with 34 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
js/moreInfo/index.js
View File

@@ -6,7 +6,6 @@ const path = require('path');
const fs = require('fs');
const log = require('../log.js');
const logLevels = require('../enums/logLevels.js');
const { version, clientVersion, buildNumber } = require('../../package.json');
const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js');
const i18n = require('../translation/i18n');
const { isMac } = require('../utils/misc');
@@ -88,7 +87,18 @@ function openMoreInfoWindow(windowName) {
// initialize crash reporter
initCrashReporterMain({ process: 'more info window' });
initCrashReporterRenderer(moreInfoWindow, { process: 'render | more info window' });
moreInfoWindow.webContents.send('versionInfo', { version, clientVersion, buildNumber });
const moreInfo = {
electronVersion: process.versions.electron,
chromiumVersion: process.versions.chrome,
v8Version: process.versions.v8,
nodeVersion: process.versions.node,
opensslVersion: process.versions.openssl,
zlibVersion: process.versions.zlib,
uvVersion: process.versions.uv,
aresVersion: process.versions.ares,
httpparserVersion: process.versions.http_parser
};
moreInfoWindow.webContents.send('moreInfo', moreInfo);
if (!isMac) {
// prevents from displaying menu items when "alt" key is pressed
moreInfoWindow.setMenu(null);

49
js/moreInfo/renderer.js
View File

@@ -1,34 +1,29 @@
'use strict';
const { ipcRenderer, crashReporter } = require('electron');
renderDom();
ipcRenderer.on('moreInfo', (event, moreInfo) => {
/**
* Method that renders application data
*/
function renderDom() {
document.addEventListener('DOMContentLoaded', function () {
const electronV = document.getElementById('electron');
const chromiumV = document.getElementById('chromium');
const v8V = document.getElementById('v8');
const nodeV = document.getElementById('node');
const opensslV = document.getElementById('openssl');
const zlibV = document.getElementById('zlib');
const uvV = document.getElementById('uv');
const aresV = document.getElementById('ares');
const httpparserV = document.getElementById('httpparser');
const {electronVersion, chromiumVersion, v8Version, nodeVersion, opensslVersion, zlibVersion, uvVersion, aresVersion, httpparserVersion} = moreInfo;
const electronV = document.getElementById('electron');
const chromiumV = document.getElementById('chromium');
const v8V = document.getElementById('v8');
const nodeV = document.getElementById('node');
const opensslV = document.getElementById('openssl');
const zlibV = document.getElementById('zlib');
const uvV = document.getElementById('uv');
const aresV = document.getElementById('ares');
const httpparserV = document.getElementById('httpparser');
electronV.innerHTML = `<u>Electron</u> ${process.versions.electron}`;
chromiumV.innerHTML = `<u>Chromium</u> ${process.versions.chrome}`;
v8V.innerHTML = `<u>V8</u> ${process.versions.v8}`;
nodeV.innerHTML = `<u>Node</u> ${process.versions.node}`;
opensslV.innerHTML = `<u>OpenSSL</u> ${process.versions.openssl}`;
zlibV.innerHTML = `<u>ZLib</u> ${process.versions.zlib}`;
uvV.innerHTML = `<u>UV</u> ${process.versions.uv}`;
aresV.innerHTML = `<u>Ares</u> ${process.versions.ares}`;
httpparserV.innerHTML = `<u>HTTP Parser</u> ${process.versions.http_parser}`;
});
}
electronV.innerHTML = `<u>Electron</u> ${electronVersion || 'N/A'}`;
chromiumV.innerHTML = `<u>Chromium</u> ${chromiumVersion || 'N/A'}`;
v8V.innerHTML = `<u>V8</u> ${v8Version || 'N/A'}`;
nodeV.innerHTML = `<u>Node</u> ${nodeVersion || 'N/A'}`;
opensslV.innerHTML = `<u>OpenSSL</u> ${opensslVersion || 'N/A'}`;
zlibV.innerHTML = `<u>ZLib</u> ${zlibVersion || 'N/A'}`;
uvV.innerHTML = `<u>UV</u> ${uvVersion || 'N/A'}`;
aresV.innerHTML = `<u>Ares</u> ${aresVersion || 'N/A'}`;
httpparserV.innerHTML = `<u>HTTP Parser</u> ${httpparserVersion || 'N/A'}`;
});
ipcRenderer.on('register-crash-reporter', (event, arg) => {
if (arg && typeof arg === 'object') {
@@ -51,4 +46,4 @@ window.addEventListener('drop', function(e) {
window.addEventListener('dragover', function(e) {
e.preventDefault();
e.stopPropagation();
});
});