fix(runtime): error when using models with configuration file

Fixes ALOY-1598
tidev · Oct 24, 2019 · 0d6a312 · 0d6a312
1 parent 4418a13
commit 0d6a312
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/Alloy/commands/compile/styler.js b/Alloy/commands/compile/styler.js
@@ -578,20 +578,19 @@ exports.generateStyleParams = function(styles, classes, id, apiName, extraStyle,
 				} else if (referencePath[0] === '$') {
 					// instance model binding
 					attribute = referencePath.splice(2, referencePath.length);
-				} else if (_.includes(CU.models, referencePath[0])) {
-					// global model binding
-					attribute = referencePath.splice(1, referencePath.length);
-					referencePath.unshift('Alloy', 'Models');
-				} else {
+				} else if (collectionModelVar !== CONST.BIND_MODEL_VAR) {
 					// collection binding (deep)
 					bindsCollection = true;
+				} else {
+					// default to global model binding
+					attribute = referencePath.splice(1, referencePath.length);
+					referencePath.unshift('Alloy', 'Models');
 				}
 
 				// model binding
 				if (attribute !== undefined) {
 					modelVar = fromPath(referencePath);
 					reference = fromPath(referencePath.concat(CONST.BIND_TRANSFORM_VAR, attribute));
-
 					if (!_.includes(bindsModels, modelVar)) {
 						bindsModels.push(modelVar);
 					}

diff --git a/package-lock.json b/package-lock.json