Refactoring fix #29
This commit is contained in:
1 parent
10b069b6e5
commit
fd758a7df7
15 files changed
+25
-33
No files matched your search
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
+1
-1
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
|
||||
+4
-4
@@ -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 */
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -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);
|
||||
|
||||
|
||||
+1
-9
@@ -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();
|
||||
|
||||
">
|
||||
|
||||
|
||||
<div id="root"></div>
|
||||
<div id="canvasDiv"></div>
|
||||
<div id="canvasApp"></div>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
Reference in new issue
Block a user