pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made optional pass flag a parameter to viewmodel factory

Browse source 
Also some minor whitespace related stuff and some comments
This commit is contained in:
Gina Häußge 2016-06-15 10:41:59 +02:00
parent 9e2f24b767
commit 8616bc13cb
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/octoprint/static/js/app/main.js
View file

@ -182,17 +182,17 @@ $(function() {
}
// helper to create a view model instance with injected constructor parameters from the view model map
var _createViewModelInstance = function(viewModel, viewModelMap) {
var _createViewModelInstance = function(viewModel, viewModelMap, optionalDependencyPass) {
// mirror the requested dependencies with an array of the viewModels
var viewModelParametersMap = function(parameter) {
// check if parameter is found within optional array and if all conditions are met return null instead of undefined
if (optionalDependencyPass && viewModel.optional.indexOf(parameter) !== -1 && !viewModelMap[parameter]) {
log.debug("Resolving optional parameter", [parameter], "without viewmodel");
return null
return null; // null == "optional but not available"
}
return viewModelMap[parameter] || undefined
return viewModelMap[parameter] || undefined; // undefined == "not available"
};
// try to resolve all of the view model's constructor parameters via our view model map
@ -282,7 +282,7 @@ $(function() {
continue;
}
var viewModelInstance = _createViewModelInstance(viewModel, viewModelMap);
var viewModelInstance = _createViewModelInstance(viewModel, viewModelMap, optionalDependencyPass);
// our view model couldn't yet be instantiated, so postpone it for a bit
if (viewModelInstance === undefined) {
@ -310,7 +310,7 @@ $(function() {
// dependencies of remaining ones, so log that as an error and then quit the loop
if (unprocessedViewModels.length === startLength) {
// I'm gonna let you finish but we will do another pass with the optional dependencies flag enabled
if(!optionalDependencyPass) {
if (!optionalDependencyPass) {
log.debug("Resolving next pass with optional dependencies flag enabled");
optionalDependencyPass = true;
} else {