if/SymphonyElectron
1
0
Fork 0
mirror of https://github.com/finos/SymphonyElectron.git synced 2024-12-31 19:27:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

ELECTRON-874 (Change version numbering 1.53-3.4.0) (#522)

Browse Source 
* ELECTRON-874 Change version numbering 1.53.0-3.4.0 (0)

* ELECTRON-874 setAboutPanelOptions only if running in Mac
This commit is contained in:
Kiran Niranjan 2018-10-26 22:37:31 +05:30 committed by Vishwas Shashidhar
parent 5d69857206
commit e4b28f176d
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/aboutApp/index.js
View File

@ -6,7 +6,7 @@ const path = require('path');
const fs = require('fs'); const fs = require('fs');
const log = require('../log.js'); const log = require('../log.js');
const logLevels = require('../enums/logLevels.js'); const logLevels = require('../enums/logLevels.js');
const buildNumber = require('../../package.json').buildNumber; const { version, clientVersion, buildNumber } = require('../../package.json');
const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js'); const { initCrashReporterMain, initCrashReporterRenderer } = require('../crashReporter.js');
const i18n = require('../translation/i18n'); const i18n = require('../translation/i18n');
@ -87,7 +87,7 @@ function openAboutWindow(windowName) {
// initialize crash reporter // initialize crash reporter
initCrashReporterMain({ process: 'about app window' }); initCrashReporterMain({ process: 'about app window' });
initCrashReporterRenderer(aboutWindow, { process: 'render | about app window' }); initCrashReporterRenderer(aboutWindow, { process: 'render | about app window' });
aboutWindow.webContents.send('buildNumber', buildNumber || '0'); aboutWindow.webContents.send('versionInfo', { version, clientVersion, buildNumber });
}); });
aboutWindow.webContents.on('crashed', function () { aboutWindow.webContents.on('crashed', function () {

8
js/aboutApp/renderer.js
View File

@ -17,12 +17,12 @@ function renderDom() {
}); });
} }
ipcRenderer.on('buildNumber', (event, buildNumber) => { ipcRenderer.on('versionInfo', (event, versionInfo) => {
let versionText = document.getElementById('version'); const versionText = document.getElementById('version');
const version = remote.app.getVersion(); const { version, clientVersion, buildNumber } = versionInfo;
if (versionText) { if (versionText) {
versionText.innerHTML = version ? `Version ${version} (${version}.${buildNumber})` : 'N/A'; versionText.innerHTML = version ? `Version ${clientVersion}-${version} (${buildNumber})` : 'N/A';
} }
}); });

3
js/main.js
View File

@ -9,6 +9,7 @@ const shellPath = require('shell-path');
const urlParser = require('url'); const urlParser = require('url');
const nodePath = require('path'); const nodePath = require('path');
const compareSemVersions = require('./utils/compareSemVersions.js'); const compareSemVersions = require('./utils/compareSemVersions.js');
const { version, clientVersion, buildNumber } = require('../package.json');
// Local Dependencies // Local Dependencies
const { const {
@ -230,6 +231,8 @@ app.on('activate', function () {
// because electron leaves registry traces upon uninstallation // because electron leaves registry traces upon uninstallation
if (isMac) { if (isMac) {
app.setAsDefaultProtocolClient('symphony'); app.setAsDefaultProtocolClient('symphony');
// Sets application version info that will be displayed in about app panel
app.setAboutPanelOptions({ applicationVersion: `${clientVersion}-${version}`, version: buildNumber });
} }
/** /**

1
package.json
View File

@ -2,6 +2,7 @@
"name": "Symphony", "name": "Symphony",
"productName": "Symphony", "productName": "Symphony",
"version": "3.4.0", "version": "3.4.0",
"clientVersion": "1.53",
"buildNumber": "0", "buildNumber": "0",
"description": "Symphony desktop app (Foundation ODP)", "description": "Symphony desktop app (Foundation ODP)",
"author": "Symphony", "author": "Symphony",