diff --git a/BottomSpace/ChartAspectRatio.js b/BottomSpace/ChartAspectRatio.js index bdf41b6eb..0f57db2ae 100644 --- a/BottomSpace/ChartAspectRatio.js +++ b/BottomSpace/ChartAspectRatio.js @@ -44,7 +44,7 @@ canDrawIcon = true; } - icon.src = "Images/Icons/chart-scale.png"; + icon.src = window.URL_PREFIX + "Images/Icons/chart-scale.png"; thisObject.container.eventHandler.listenToEvent('Mouse Wheel', onMouseWheel); diff --git a/BottomSpace/DeleteTradingHistory.js b/BottomSpace/DeleteTradingHistory.js index e068bfb48..7b6d1a640 100644 --- a/BottomSpace/DeleteTradingHistory.js +++ b/BottomSpace/DeleteTradingHistory.js @@ -46,7 +46,7 @@ function newDeleteTradingHistory() { canDrawIcon = true; } - icon.src = "Images/Icons/trash.png"; + icon.src = window.URL_PREFIX + "Images/Icons/trash.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/KeyVaultModule.js b/BottomSpace/KeyVaultModule.js index 5ed3c6256..53a522d6e 100644 --- a/BottomSpace/KeyVaultModule.js +++ b/BottomSpace/KeyVaultModule.js @@ -46,7 +46,7 @@ function newKeyVaultModule() { canDrawIcon = true; } - icon.src = "Images/Icons/key-vault-module.png"; + icon.src = window.URL_PREFIX + "Images/Icons/key-vault-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/PlayStopButton.js b/BottomSpace/PlayStopButton.js index 960b96d21..37b4a8b7b 100644 --- a/BottomSpace/PlayStopButton.js +++ b/BottomSpace/PlayStopButton.js @@ -44,11 +44,11 @@ function newPlayStopButton() { canDraw = true; } - play.src = "Images/Icons/play.png"; + play.src = window.URL_PREFIX + "Images/Icons/play.png"; stop = new Image(); - stop.src = "Images/Icons/pause.png"; + stop.src = window.URL_PREFIX + "Images/Icons/pause.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/TeamsModule.js b/BottomSpace/TeamsModule.js index 0f235afc0..e6d537851 100644 --- a/BottomSpace/TeamsModule.js +++ b/BottomSpace/TeamsModule.js @@ -46,7 +46,7 @@ function newTeamsModule() { canDrawIcon = true; } - icon.src = "Images/Icons/teams-module.png"; + icon.src = window.URL_PREFIX + "Images/Icons/teams-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/UsersModule.js b/BottomSpace/UsersModule.js index 758ddaefa..03c611417 100644 --- a/BottomSpace/UsersModule.js +++ b/BottomSpace/UsersModule.js @@ -46,7 +46,7 @@ function newUsersModule() { canDrawIcon = true; } - icon.src = "Images/Icons/users-module.png"; + icon.src = window.URL_PREFIX + "Images/Icons/users-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/FloatingSpace/ProfileBall.js b/FloatingSpace/ProfileBall.js index ffecb249f..b826334d2 100644 --- a/FloatingSpace/ProfileBall.js +++ b/FloatingSpace/ProfileBall.js @@ -74,11 +74,11 @@ function newProfileBall() { menuItem.canDrawIcon = true; } - menuItem.iconOff.src = menuItem.imagePathOff; + menuItem.iconOff.src = window.URL_PREFIX + menuItem.imagePathOff; } - menuItem.iconOn.src = menuItem.imagePathOn; + menuItem.iconOn.src = window.URL_PREFIX + menuItem.imagePathOn; menuItem.icon = menuItem.iconOn; // The default value is ON. diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index 70cca27d6..56961bc01 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -115,7 +115,7 @@ for (let i = 0; i < modulesArray.length; i++) { - let path = modulesArray[i]; + let path = window.URL_PREFIX + modulesArray[i]; REQUIREJS([path], onRequired); diff --git a/Scripts/AppPreLoader.js b/Scripts/AppPreLoader.js index 23f48e466..977092adb 100644 --- a/Scripts/AppPreLoader.js +++ b/Scripts/AppPreLoader.js @@ -67,7 +67,7 @@ function loadAdvancedAlgosPlatform() { let sessionToken = window.SESSION_TOKEN; if (sessionToken === undefined) { sessionToken = ""} - let path = "AABrowserAPI/authenticateUser/" + sessionToken; + let path = window.URL_PREFIX + "AABrowserAPI/authenticateUser/" + sessionToken; callServer(undefined, path, onServerReponded); @@ -95,7 +95,7 @@ function loadAdvancedAlgosPlatform() { if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadDebugModule -> Entering function."); } - let path = "WebDebugLog.js"; + let path = window.URL_PREFIX + "WebDebugLog.js"; REQUIREJS([path], onRequired); @@ -114,7 +114,7 @@ function loadAdvancedAlgosPlatform() { if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadModules -> Entering function."); } - let path = "Scripts/AppLoader.js"; + let path = window.URL_PREFIX + "Scripts/AppLoader.js"; REQUIREJS([path], onRequired); diff --git a/SplashScreen.js b/SplashScreen.js index 34d7cc650..16d1a8ab0 100644 --- a/SplashScreen.js +++ b/SplashScreen.js @@ -49,7 +49,7 @@ function newSplashScreen() { canDrawLogo = true; } - logo.src = "Images/aa-logo.png"; + logo.src = window.URL_PREFIX + "Images/aa-logo.png"; } diff --git a/TimelineChart.js b/TimelineChart.js index 2cfd5dcc4..0f49963e8 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -85,10 +85,10 @@ canDrawLogoAA = true; } - logoA.src = "Images/tether-logo-background.png"; - logoB.src = "Images/bitcoin-logo-background.png"; - logoExchange.src = "Images/poloniex-logo-background.png"; - logoAA.src = "Images/aa-logo-background.png"; + logoA.src = window.URL_PREFIX + "Images/tether-logo-background.png"; + logoB.src = window.URL_PREFIX + "Images/bitcoin-logo-background.png"; + logoExchange.src = window.URL_PREFIX + "Images/poloniex-logo-background.png"; + logoAA.src = window.URL_PREFIX + "Images/aa-logo-background.png"; /* Remember the Products Panel */ diff --git a/TopSpace/CompanyLogo.js b/TopSpace/CompanyLogo.js index 88a65bc7a..a1972ef45 100644 --- a/TopSpace/CompanyLogo.js +++ b/TopSpace/CompanyLogo.js @@ -35,7 +35,7 @@ function newCompanyLogo() { canDrawLogo = true; } - logo.src = "Images/aa-logo-dark-8.png"; + logo.src = window.URL_PREFIX + "Images/aa-logo-dark-8.png"; } diff --git a/index.html b/index.html index 4635a841c..14438d730 100644 --- a/index.html +++ b/index.html @@ -16,6 +16,7 @@ window.SESSION_TOKEN = ''; window.EXECUTING_AT = 'Master App'; + window.URL_PREFIX = 'http://localhost:1337/'; loadAdvancedAlgosPlatform(); ">