Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix some coding standards issues

Browse source
This commit is contained in:
Roxanne Skelly 2018-10-02 10:00:42 -07:00
parent 010e2091fa
commit 95ef46d77c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -107,7 +107,7 @@ userConfig.load(configPath);
const ipcMain = electron.ipcMain; const ipcMain = electron.ipcMain;
function isInterfaceInstalled() { function isInterfaceInstalled () {
if (osType == "Darwin") { if (osType == "Darwin") {
// In OSX Sierra, the app translocation process moves // In OSX Sierra, the app translocation process moves
// the executable to a random location before starting it // the executable to a random location before starting it
@ -120,7 +120,7 @@ function isInterfaceInstalled() {
} }
} }
function isServerInstalled() { function isServerInstalled () {
return dsPath && acPath; return dsPath && acPath;
} }
@ -338,7 +338,7 @@ const HifiNotificationType = hfNotifications.NotificationType;
var pendingNotifications = {} var pendingNotifications = {}
var notificationState = NotificationState.UNNOTIFIED; var notificationState = NotificationState.UNNOTIFIED;
function setNotificationState(notificationType, pending = true) { function setNotificationState (notificationType, pending = true) {
pendingNotifications[notificationType] = pending; pendingNotifications[notificationType] = pending;
notificationState = NotificationState.UNNOTIFIED; notificationState = NotificationState.UNNOTIFIED;
for (var key in pendingNotifications) { for (var key in pendingNotifications) {
@ -526,7 +526,7 @@ function buildMenuArray(serverState) {
menuArray.push(labels.share); menuArray.push(labels.share);
menuArray.push(separator); menuArray.push(separator);
if (isInterfaceInstalled()) { if (isInterfaceInstalled()) {
if(trayNotifications.enabled()) { if (trayNotifications.enabled()) {
menuArray.push(labels.goto); menuArray.push(labels.goto);
menuArray.push(labels.people); menuArray.push(labels.people);
menuArray.push(labels.wallet); menuArray.push(labels.wallet);

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

@ -123,7 +123,7 @@ HifiNotification.prototype = {
timeout: 5 timeout: 5
}, },
function (error, reason, metadata) { function (error, reason, metadata) {
if(_finished) { if (_finished) {
if (osType === 'Darwin') { if (osType === 'Darwin') {
setTimeout(_finished, OSX_CLICK_DELAY_TIMEOUT); setTimeout(_finished, OSX_CLICK_DELAY_TIMEOUT);
} else { } else {