diff --git a/SplashScreen.js b/SplashScreen.js index a4c43f411..14293b854 100644 --- a/SplashScreen.js +++ b/SplashScreen.js @@ -125,7 +125,7 @@ function newSplashScreen () { fontSize = 15 - title = 'Trading Bots Competitions Platform' + title = 'Trading Automation System' titlePoint = { x: thisObject.container.frame.width / 2 - title.length / 2 * fontSize * FONT_ASPECT_RATIO - 20, diff --git a/SystemEventHandler.js b/SystemEventHandler.js index 072fa880b..740048d48 100644 --- a/SystemEventHandler.js +++ b/SystemEventHandler.js @@ -30,7 +30,13 @@ function newSystemEventHandler () { function sendCommand (command, responseCallBack, eventsCallBack) { if (command.action === 'listenToEvent') { - eventListeners.set(command.eventHandlerName + '-' + command.eventType, eventsCallBack) + let key + if (command.callerId !== undefined) { + key = command.eventHandlerName + '-' + command.eventType + '-' + command.callerId + } else { + key = command.eventHandlerName + '-' + command.eventType + } + eventListeners.set(key, eventsCallBack) } if (command.callerId && responseCallBack) { responseWaiters.set(command.callerId, responseCallBack) @@ -107,7 +113,13 @@ function newSystemEventHandler () { let message = JSON.parse(e.data) if (message.action === 'Event Raised') { - let handler = eventListeners.get(message.eventHandlerName + '-' + message.eventType) + let key + if (message.callerId !== undefined) { + key = message.eventHandlerName + '-' + message.eventType + '-' + message.callerId + } else { + key = message.eventHandlerName + '-' + message.eventType + } + let handler = eventListeners.get(key) if (handler) { handler(message) }