Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'sysTrayOsx' of https://github.com/roxanneskelly/hifi into sysTraySetup

Browse source
This commit is contained in:
Roxanne Skelly 2018-09-27 11:44:41 -07:00
commit 00a5075d34
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -148,7 +148,6 @@ function HifiNotifications(config, menuNotificationCallback) {
var _menuNotificationCallback = menuNotificationCallback;
notifier.on('click', function (notifierObject, options) {
console.log("click.");
StartInterface(options.url);
_menuNotificationCallback(options.notificationType, false);
});
@ -187,18 +186,7 @@ HifiNotifications.prototype = {
},
MARKETPLACE_NOTIFICATION_POLL_TIME_MS);
} else {
if (this.storiesPollTimer) {
clearInterval(this.storiesPollTimer);
}
if (this.peoplePollTimer) {
clearInterval(this.peoplePollTimer);
}
if (this.walletPollTimer) {
clearInterval(this.walletPollTimer);
}
if (this.marketplacePollTimer) {
clearInterval(this.marketplacePollTimer);
}
this.stopPolling();
}
},
enabled: function () {
@ -210,7 +198,18 @@ HifiNotifications.prototype = {
this.config.set("walletNotifySince", this.walletSince.toISOString());
this.config.set("marketplaceNotifySince", this.marketplaceSince.toISOString());
this.enable(false);
if (this.storiesPollTimer) {
clearInterval(this.storiesPollTimer);
}
if (this.peoplePollTimer) {
clearInterval(this.peoplePollTimer);
}
if (this.walletPollTimer) {
clearInterval(this.walletPollTimer);
}
if (this.marketplacePollTimer) {
clearInterval(this.marketplacePollTimer);
}
},
_showNotification: function () {
var _this = this;

3
server-console/src/modules/path-finder.js
View file

@ -55,6 +55,9 @@ exports.searchPaths = function(name, binaryType, releaseType) {
// check beside the app bundle for the binaries
paths.push(path.join(path.dirname(appPath), name + extension));
// check in the peer bundle for the binaries
paths.push(path.join("..", name + extension));
}
}
}