diff --git a/BottomSpace/ChartAspectRatio.js b/BottomSpace/ChartAspectRatio.js index 0f57db2ae..d879bc11b 100644 --- a/BottomSpace/ChartAspectRatio.js +++ b/BottomSpace/ChartAspectRatio.js @@ -44,7 +44,7 @@ canDrawIcon = true; } - icon.src = window.URL_PREFIX + "Images/Icons/chart-scale.png"; + icon.src = window.canvasApp.urlPrefix + "Images/Icons/chart-scale.png"; thisObject.container.eventHandler.listenToEvent('Mouse Wheel', onMouseWheel); diff --git a/BottomSpace/DeleteTradingHistory.js b/BottomSpace/DeleteTradingHistory.js index b4f4c692e..813472c3f 100644 --- a/BottomSpace/DeleteTradingHistory.js +++ b/BottomSpace/DeleteTradingHistory.js @@ -46,7 +46,7 @@ function newDeleteTradingHistory() { canDrawIcon = true; } - icon.src = window.URL_PREFIX + "Images/Icons/trash.png"; + icon.src = window.canvasApp.urlPrefix + "Images/Icons/trash.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/KeyVaultModule.js b/BottomSpace/KeyVaultModule.js index f86974bba..5e4123817 100644 --- a/BottomSpace/KeyVaultModule.js +++ b/BottomSpace/KeyVaultModule.js @@ -50,7 +50,7 @@ function newKeyVaultModule() { canDrawIcon = true; } - icon.src = window.URL_PREFIX + "Images/Icons/key-vault-module.png"; + icon.src = window.canvasApp.urlPrefix + "Images/Icons/key-vault-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/PlayStopButton.js b/BottomSpace/PlayStopButton.js index b1ad6d469..62c9ef036 100644 --- a/BottomSpace/PlayStopButton.js +++ b/BottomSpace/PlayStopButton.js @@ -44,11 +44,11 @@ function newPlayStopButton() { canDraw = true; } - play.src = window.URL_PREFIX + "Images/Icons/play.png"; + play.src = window.canvasApp.urlPrefix + "Images/Icons/play.png"; stop = new Image(); - stop.src = window.URL_PREFIX + "Images/Icons/pause.png"; + stop.src = window.canvasApp.urlPrefix + "Images/Icons/pause.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/TeamsModule.js b/BottomSpace/TeamsModule.js index c90eca193..a22479bd6 100644 --- a/BottomSpace/TeamsModule.js +++ b/BottomSpace/TeamsModule.js @@ -50,7 +50,7 @@ function newTeamsModule() { canDrawIcon = true; } - icon.src = window.URL_PREFIX + "Images/Icons/teams-module.png"; + icon.src = window.canvasApp.urlPrefix + "Images/Icons/teams-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/BottomSpace/UsersModule.js b/BottomSpace/UsersModule.js index ec8689c22..8682fa52d 100644 --- a/BottomSpace/UsersModule.js +++ b/BottomSpace/UsersModule.js @@ -50,7 +50,7 @@ function newUsersModule() { canDrawIcon = true; } - icon.src = window.URL_PREFIX + "Images/Icons/users-module.png"; + icon.src = window.canvasApp.urlPrefix + "Images/Icons/users-module.png"; thisObject.container.eventHandler.listenToEvent("onMouseClick", onClick); diff --git a/CloudVM/CloudRequire.js b/CloudVM/CloudRequire.js index 403aa8809..464f72391 100644 --- a/CloudVM/CloudRequire.js +++ b/CloudVM/CloudRequire.js @@ -18,7 +18,7 @@ if (INFO_LOG === true) { logger.write(MODULE_NAME, "[INFO] downloadBot -> Entering function."); } - let filePath = window.URL_PREFIX + "Bots" + "/" + pFilePath + "/" + "User.Bot.js"; + let filePath = window.canvasApp.urlPrefix + "Bots" + "/" + pFilePath + "/" + "User.Bot.js"; downloadModule(filePath, onDownloaded) @@ -41,7 +41,7 @@ if (INFO_LOG === true) { logger.write(MODULE_NAME, "[INFO] downloadCommons -> Entering function."); } - let filePath = window.URL_PREFIX + "Bots" + "/" + pFilePath + "/" + "Commons.js"; + let filePath = window.canvasApp.urlPrefix + "Bots" + "/" + pFilePath + "/" + "Commons.js"; downloadModule(filePath, onDownloaded) diff --git a/FloatingSpace/ProfileBall.js b/FloatingSpace/ProfileBall.js index b826334d2..c8c4493ee 100644 --- a/FloatingSpace/ProfileBall.js +++ b/FloatingSpace/ProfileBall.js @@ -74,11 +74,11 @@ function newProfileBall() { menuItem.canDrawIcon = true; } - menuItem.iconOff.src = window.URL_PREFIX + menuItem.imagePathOff; + menuItem.iconOff.src = window.canvasApp.urlPrefix + menuItem.imagePathOff; } - menuItem.iconOn.src = window.URL_PREFIX + menuItem.imagePathOn; + menuItem.iconOn.src = window.canvasApp.urlPrefix + menuItem.imagePathOn; menuItem.icon = menuItem.iconOn; // The default value is ON. diff --git a/Scripts/AppLoader.js b/Scripts/AppLoader.js index 56961bc01..f1280025e 100644 --- a/Scripts/AppLoader.js +++ b/Scripts/AppLoader.js @@ -115,7 +115,7 @@ for (let i = 0; i < modulesArray.length; i++) { - let path = window.URL_PREFIX + modulesArray[i]; + let path = window.canvasApp.urlPrefix + modulesArray[i]; REQUIREJS([path], onRequired); diff --git a/Scripts/AppPreLoader.js b/Scripts/AppPreLoader.js index a98255397..ae7730560 100644 --- a/Scripts/AppPreLoader.js +++ b/Scripts/AppPreLoader.js @@ -53,8 +53,8 @@ function loadAdvancedAlgosPlatform() { canvas.style.border = "0"; canvas.style = "position:absolute; top:0px; left:0px; z-index:1"; - let canvasDiv = document.getElementById('canvasDiv'); - canvasDiv.appendChild(canvas); + let canvasApp = document.getElementById('canvasApp'); + canvasApp.appendChild(canvas); browserCanvas = document.getElementById('canvas'); @@ -69,7 +69,7 @@ function loadAdvancedAlgosPlatform() { let sessionToken = window.canvasApp.sessionToken; if (sessionToken === undefined) { sessionToken = ""} - let path = window.URL_PREFIX + "AABrowserAPI/authenticateUser/" + sessionToken; + let path = window.canvasApp.urlPrefix + "AABrowserAPI/authenticateUser/" + sessionToken; callServer(undefined, path, onServerReponded); @@ -98,7 +98,7 @@ function loadAdvancedAlgosPlatform() { if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadDebugModule -> Entering function."); } - let path = window.URL_PREFIX + "WebDebugLog.js"; + let path = window.canvasApp.urlPrefix + "WebDebugLog.js"; REQUIREJS([path], onRequired); @@ -117,7 +117,7 @@ function loadAdvancedAlgosPlatform() { if (INFO_LOG === true) { console.log(spacePad(MODULE_NAME, 50) + " : " + "[INFO] loadModules -> Entering function."); } - let path = window.URL_PREFIX + "Scripts/AppLoader.js"; + let path = window.canvasApp.urlPrefix + "Scripts/AppLoader.js"; REQUIREJS([path], onRequired); diff --git a/SplashScreen.js b/SplashScreen.js index 7a81d046f..8038ca0af 100644 --- a/SplashScreen.js +++ b/SplashScreen.js @@ -49,7 +49,7 @@ function newSplashScreen() { canDrawLogo = true; } - logo.src = window.URL_PREFIX + "Images/aa-logo.png"; + logo.src = window.canvasApp.urlPrefix + "Images/aa-logo.png"; } diff --git a/TimelineChart.js b/TimelineChart.js index 0f49963e8..3c74f7f70 100644 --- a/TimelineChart.js +++ b/TimelineChart.js @@ -85,10 +85,10 @@ canDrawLogoAA = true; } - 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"; + logoA.src = window.canvasApp.urlPrefix + "Images/tether-logo-background.png"; + logoB.src = window.canvasApp.urlPrefix + "Images/bitcoin-logo-background.png"; + logoExchange.src = window.canvasApp.urlPrefix + "Images/poloniex-logo-background.png"; + logoAA.src = window.canvasApp.urlPrefix + "Images/aa-logo-background.png"; /* Remember the Products Panel */ diff --git a/TopSpace/CompanyLogo.js b/TopSpace/CompanyLogo.js index a44d1bf37..b29d93a43 100644 --- a/TopSpace/CompanyLogo.js +++ b/TopSpace/CompanyLogo.js @@ -40,7 +40,7 @@ function newCompanyLogo() { canDrawLogo = true; } - logo.src = window.URL_PREFIX + "Images/aa-logo-dark-8.png"; + logo.src = window.canvasApp.urlPrefix + "Images/aa-logo-dark-8.png"; } diff --git a/TopSpace/Login.js b/TopSpace/Login.js index 65511a040..f56a3fc8f 100644 --- a/TopSpace/Login.js +++ b/TopSpace/Login.js @@ -198,7 +198,7 @@ function newLogin() { if (sessionToken === undefined) { sessionToken = "" } - let path = window.URL_PREFIX + "AABrowserAPI/authenticateUser/" + sessionToken; + let path = window.canvasApp.urlPrefix + "AABrowserAPI/authenticateUser/" + sessionToken; callServer(undefined, path, onServerReponded); diff --git a/index.html b/index.html index a3daeede3..128aef5c0 100644 --- a/index.html +++ b/index.html @@ -20,21 +20,13 @@ urlPrefix: 'https://develop.advancedalgos.net/' /* 'http://localhost:1337/' */ }; - window.canvasApp.sessionToken = ''; - window.canvasApp.executingAt = 'Master App'; - window.canvasApp.topMargin = 85; - window.canvasApp.visible = true; - window.URL_PREFIX = 'https://develop.advancedalgos.net/'; - //window.URL_PREFIX = 'http://localhost:1337/'; - - loadAdvancedAlgosPlatform(); ">
- +