Merge remote-tracking branch 'upstream/develop' into develop
This commit is contained in:
commit
243a9b6afe
14 files changed
+248
-11700
No files matched your search
+122
-142
@@ -1,27 +1,24 @@
|
||||
let dashboard;
|
||||
let dashboard
|
||||
|
||||
function newAppLoader() {
|
||||
function newAppLoader () {
|
||||
const MODULE_NAME = 'App Loader'
|
||||
const INFO_LOG = false
|
||||
const ERROR_LOG = true
|
||||
const INTENSIVE_LOG = false
|
||||
const logger = newWebDebugLog()
|
||||
logger.fileName = MODULE_NAME
|
||||
|
||||
const MODULE_NAME = "App Loader";
|
||||
const INFO_LOG = false;
|
||||
const ERROR_LOG = true;
|
||||
const INTENSIVE_LOG = false;
|
||||
const logger = newWebDebugLog();
|
||||
logger.fileName = MODULE_NAME;
|
||||
let thisObject = {
|
||||
loadModules: loadModules
|
||||
}
|
||||
|
||||
let thisObject = {
|
||||
loadModules: loadModules
|
||||
};
|
||||
return thisObject
|
||||
|
||||
return thisObject;
|
||||
function loadModules () {
|
||||
try {
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Entering function.') }
|
||||
|
||||
function loadModules() {
|
||||
|
||||
try {
|
||||
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Entering function."); }
|
||||
|
||||
let modulesArray = [
|
||||
let modulesArray = [
|
||||
|
||||
/* CloudWebScripts */
|
||||
|
||||
@@ -29,150 +26,133 @@ function newAppLoader() {
|
||||
|
||||
/* PlotterPanels */
|
||||
|
||||
'Globals.js',
|
||||
'Ecosystem.js',
|
||||
'MQService',
|
||||
|
||||
"Globals.js",
|
||||
"Ecosystem.js",
|
||||
"MQService",
|
||||
'TopSpace/CurrentEvent.js',
|
||||
'TopSpace/EndUser.js',
|
||||
'TopSpace/Login.js',
|
||||
|
||||
"TopSpace/CurrentEvent.js",
|
||||
"TopSpace/EndUser.js",
|
||||
"TopSpace/Login.js",
|
||||
'StrategySpace/Workspace.js',
|
||||
'StrategySpace/TradingSystem.js',
|
||||
'StrategySpace/ConstGetStrategies.js',
|
||||
'StrategySpace/ConstNewStrategy.js',
|
||||
'StrategySpace/ConstUpdateStrategy.js',
|
||||
'StrategySpace/ConstDeleteStrategy.js',
|
||||
|
||||
"StrategySpace/Workspace.js",
|
||||
"StrategySpace/TradingSystem.js",
|
||||
"StrategySpace/ConstGetStrategies.js",
|
||||
"StrategySpace/ConstNewStrategy.js",
|
||||
"StrategySpace/ConstUpdateStrategy.js",
|
||||
"StrategySpace/ConstDeleteStrategy.js",
|
||||
'Utilities/RoundedCornersBackground.js',
|
||||
|
||||
"Utilities/RoundedCornersBackground.js",
|
||||
'Panels/TimeControlPanel.js',
|
||||
'Panels/ProductsPanel.js',
|
||||
'Panels/PanelTabButton.js',
|
||||
'Panels/ProductCard.js',
|
||||
|
||||
"Panels/TimeControlPanel.js",
|
||||
"Panels/ProductsPanel.js",
|
||||
"Panels/PanelTabButton.js",
|
||||
"Panels/ProductCard.js",
|
||||
'ControlsToolBox/SidePanel.js',
|
||||
'ControlsToolBox/SidePanelTab.js',
|
||||
|
||||
"ControlsToolBox/SidePanel.js",
|
||||
"ControlsToolBox/SidePanelTab.js",
|
||||
|
||||
"Spaces/BottomSpace.js",
|
||||
"Spaces/TopSpace.js",
|
||||
"Spaces/PanelsSpace.js",
|
||||
"Spaces/ChartSpace.js",
|
||||
"Spaces/FloatingSpace.js",
|
||||
"Spaces/StrategySpace.js",
|
||||
'Spaces/BottomSpace.js',
|
||||
'Spaces/TopSpace.js',
|
||||
'Spaces/PanelsSpace.js',
|
||||
'Spaces/ChartSpace.js',
|
||||
'Spaces/FloatingSpace.js',
|
||||
'Spaces/StrategySpace.js',
|
||||
|
||||
"Files/SingleFile.js",
|
||||
"Files/FileCloud.js",
|
||||
"Files/MarketFiles.js",
|
||||
"Files/DailyFiles.js",
|
||||
"Files/FileCursor.js",
|
||||
"Files/FileSequence.js",
|
||||
"Files/FileStorage.js",
|
||||
'Files/SingleFile.js',
|
||||
'Files/FileCloud.js',
|
||||
'Files/MarketFiles.js',
|
||||
'Files/DailyFiles.js',
|
||||
'Files/FileCursor.js',
|
||||
'Files/FileSequence.js',
|
||||
'Files/FileStorage.js',
|
||||
|
||||
"FloatingSpace/NoteSets.js",
|
||||
"FloatingSpace/Note.js",
|
||||
"FloatingSpace/ProfileBalls.js",
|
||||
"FloatingSpace/ProfileBall.js",
|
||||
"FloatingSpace/FloatingObject.js",
|
||||
"FloatingSpace/FloatingLayer.js",
|
||||
"FloatingSpace/StrategyPartConstructor.js",
|
||||
"FloatingSpace/StrategyPart.js",
|
||||
"FloatingSpace/StrategyPartTitle.js",
|
||||
"FloatingSpace/CircularMenu.js",
|
||||
"FloatingSpace/CircularMenuItem.js",
|
||||
"FloatingSpace/CodeEditor.js",
|
||||
'FloatingSpace/NoteSets.js',
|
||||
'FloatingSpace/Note.js',
|
||||
'FloatingSpace/ProfileBalls.js',
|
||||
'FloatingSpace/ProfileBall.js',
|
||||
'FloatingSpace/FloatingObject.js',
|
||||
'FloatingSpace/FloatingLayer.js',
|
||||
'FloatingSpace/StrategyPartConstructor.js',
|
||||
'FloatingSpace/StrategyPart.js',
|
||||
'FloatingSpace/StrategyPartTitle.js',
|
||||
'FloatingSpace/CircularMenu.js',
|
||||
'FloatingSpace/CircularMenuItem.js',
|
||||
'FloatingSpace/CodeEditor.js',
|
||||
|
||||
"Exchange/ExchangeAPI.js",
|
||||
'Scales/RateScale.js',
|
||||
'Scales/TimeScale.js',
|
||||
'Scales/TimePeriodScale.js',
|
||||
|
||||
"Scales/RateScale.js",
|
||||
"Scales/TimeScale.js",
|
||||
"Scales/TimePeriodScale.js",
|
||||
'ChartsSpace/ChartUtilities.js',
|
||||
'ChartsSpace/PlottersManager.js',
|
||||
'ChartsSpace/TimelineChart.js',
|
||||
'ChartsSpace/TimeMachine.js',
|
||||
'ChartsSpace/ViewPort.js',
|
||||
'ChartsSpace/TimeLineCoordinateSystem.js',
|
||||
|
||||
'BottomSpace/UIControl.js',
|
||||
|
||||
"ChartsSpace/ChartUtilities.js",
|
||||
"ChartsSpace/PlottersManager.js",
|
||||
"ChartsSpace/TimelineChart.js",
|
||||
"ChartsSpace/TimeMachine.js",
|
||||
"ChartsSpace/ViewPort.js",
|
||||
"ChartsSpace/TimeLineCoordinateSystem.js",
|
||||
'Plotter.js',
|
||||
'PlotterPanel.js',
|
||||
|
||||
"BottomSpace/UIControl.js",
|
||||
'ProductStorage.js',
|
||||
'CompetitionStorage.js',
|
||||
|
||||
"Plotter.js",
|
||||
"PlotterPanel.js",
|
||||
'SplashScreen.js',
|
||||
'Canvas.js',
|
||||
'EventHandler.js',
|
||||
'Frame.js',
|
||||
|
||||
|
||||
'Animation.js',
|
||||
|
||||
"ProductStorage.js",
|
||||
"CompetitionStorage.js",
|
||||
'Container.js',
|
||||
'Displace.js',
|
||||
|
||||
"SplashScreen.js",
|
||||
"Canvas.js",
|
||||
"EventHandler.js",
|
||||
"Frame.js",
|
||||
'Azure/azure-storage.blob.js',
|
||||
|
||||
"Animation.js",
|
||||
'Utilities.js',
|
||||
'Dashboard.js'
|
||||
]
|
||||
|
||||
"Container.js",
|
||||
"Displace.js",
|
||||
let downloadedCounter = 0
|
||||
let versionParam = window.canvasApp.version
|
||||
if (versionParam === undefined) { versionParam = '' } else {
|
||||
versionParam = '?' + versionParam
|
||||
}
|
||||
|
||||
"Azure/azure-storage.blob.js",
|
||||
|
||||
"Utilities.js",
|
||||
"Dashboard.js"
|
||||
];
|
||||
for (let i = 0; i < modulesArray.length; i++) {
|
||||
let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam
|
||||
|
||||
let downloadedCounter = 0;
|
||||
let versionParam = window.canvasApp.version;
|
||||
if (versionParam === undefined) { versionParam = ''; }
|
||||
else {
|
||||
versionParam = '?' + versionParam;
|
||||
REQUIREJS([path], onRequired)
|
||||
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> Module Requested.') }
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> path = ' + path) }
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> total requested = ' + (i + 1)) }
|
||||
|
||||
function onRequired (pModule) {
|
||||
try {
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Entering function.') }
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Module Downloaded.') }
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> path = ' + path) }
|
||||
|
||||
downloadedCounter++
|
||||
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> downloadedCounter = ' + downloadedCounter) }
|
||||
|
||||
if (downloadedCounter === modulesArray.length) {
|
||||
if (INFO_LOG === true) { logger.write('[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform.') }
|
||||
|
||||
dashboard = newDashboard()
|
||||
|
||||
dashboard.start()
|
||||
}
|
||||
|
||||
for (let i = 0; i < modulesArray.length; i++) {
|
||||
|
||||
let path = window.canvasApp.urlPrefix + modulesArray[i] + versionParam;
|
||||
|
||||
REQUIREJS([path], onRequired);
|
||||
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> Module Requested."); }
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> path = " + path); }
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> total requested = " + (i + 1)); }
|
||||
|
||||
function onRequired(pModule) {
|
||||
|
||||
try {
|
||||
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Entering function."); }
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Module Downloaded."); }
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> path = " + path); }
|
||||
|
||||
downloadedCounter++;
|
||||
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> downloadedCounter = " + downloadedCounter); }
|
||||
|
||||
if (downloadedCounter === modulesArray.length) {
|
||||
|
||||
if (INFO_LOG === true) { logger.write("[INFO] loadModules -> onRequired -> Starting Advanced Algos Platform."); }
|
||||
|
||||
dashboard = newDashboard();
|
||||
|
||||
dashboard.start();
|
||||
}
|
||||
|
||||
} catch (err) {
|
||||
|
||||
if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> onRequired -> err = " + err); }
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
} catch (err) {
|
||||
|
||||
if (ERROR_LOG === true) { logger.write("[ERROR] loadModules -> err = " + err); }
|
||||
|
||||
} catch (err) {
|
||||
if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> onRequired -> err = ' + err) }
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
if (ERROR_LOG === true) { logger.write('[ERROR] loadModules -> err = ' + err) }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user