Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-15 21:59:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #14253 from roxanneskelly/Case19446

Browse source 
Case 19446 - Update via Sandbox Popup -- opens Old Interface
This commit is contained in:
Howard Stearns 2018-10-24 10:02:13 -07:00 committed by GitHub
commit e61dd7dbc1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server-console/src/main.js
View file

@ -874,10 +874,6 @@ function onContentLoaded() {
hasShownUpdateNotification = true; hasShownUpdateNotification = true;
} }
}); });
notifier.on('click', function(notifierObject, options) {
log.debug("Got click", options.url);
shell.openExternal(options.url);
});
} }
deleteOldFiles(logPath, DELETE_LOG_FILES_OLDER_THAN_X_SECONDS, LOG_FILE_REGEX); deleteOldFiles(logPath, DELETE_LOG_FILES_OLDER_THAN_X_SECONDS, LOG_FILE_REGEX);

11
server-console/src/modules/hf-notifications.js
View file

@ -5,6 +5,8 @@ const process = require('process');
const hfApp = require('./hf-app'); const hfApp = require('./hf-app');
const path = require('path'); const path = require('path');
const AccountInfo = require('./hf-acctinfo').AccountInfo; const AccountInfo = require('./hf-acctinfo').AccountInfo;
const url = require('url');
const shell = require('electron').shell;
const GetBuildInfo = hfApp.getBuildInfo; const GetBuildInfo = hfApp.getBuildInfo;
const buildInfo = GetBuildInfo(); const buildInfo = GetBuildInfo();
const osType = os.type(); const osType = os.type();
@ -154,8 +156,13 @@ function HifiNotifications(config, menuNotificationCallback) {
var _menuNotificationCallback = menuNotificationCallback; var _menuNotificationCallback = menuNotificationCallback;
notifier.on('click', function (notifierObject, options) { notifier.on('click', function (notifierObject, options) {
StartInterface(options.url); const optUrl = url.parse(options.url);
_menuNotificationCallback(options.notificationType, false); if ((optUrl.protocol === "hifi:") || (optUrl.protocol === "hifiapp:")) {
StartInterface(options.url);
_menuNotificationCallback(options.notificationType, false);
} else {
shell.openExternal(options.url);
}
}); });
} }