Skip to content
This repository has been archived by the owner on Dec 2, 2021. It is now read-only.

Commit

Permalink
Updated dist
Browse files Browse the repository at this point in the history
  • Loading branch information
IjzerenHein committed Jul 28, 2015
1 parent b6fcaad commit 49016f8
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 10 deletions.
15 changes: 9 additions & 6 deletions dist/autolayout.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @copyright Gloey Apps, 2015
*
* @library autolayout.js
* @version 0.4.1
* @version 0.4.2
* @generated 28-07-2015
*/
/**
Expand Down Expand Up @@ -3273,13 +3273,13 @@ function _processEqualSpacer(context, stackView) {
}
context.equalSpacerIndex++;

// Enforce proportional width/height
if (context.relation.multiplier && context.relation.multiplier !== 1) {
// Enforce view/proportional width/height
if (context.relation.view || context.relation.multiplier && context.relation.multiplier !== 1) {
context.constraints.push({
view1: name,
attr1: context.horizontal ? Attribute.WIDTH : Attribute.HEIGHT,
relation: context.relation.relation || Relation.EQU,
view2: null,
view2: context.relation.view,
attr2: context.horizontal ? Attribute.WIDTH : Attribute.HEIGHT,
priority: context.relation.priority,
multiplier: context.relation.multiplier
Expand Down Expand Up @@ -3337,7 +3337,7 @@ function _processProportionalSpacer(context, stackView) {
view1: name,
attr1: context.horizontal ? Attribute.WIDTH : Attribute.HEIGHT,
relation: context.relation.relation || Relation.EQU,
view2: null, // or relative to the stackView... food for thought
view2: context.relation.view, // or relative to the stackView... food for thought
attr2: context.horizontal ? Attribute.WIDTH : Attribute.HEIGHT,
priority: context.relation.priority,
multiplier: context.relation.multiplier
Expand Down Expand Up @@ -3509,7 +3509,10 @@ function _processCascade(context, cascade, stackView) {

if (stackView) {
subView = context.subViews[stackView];
if (subView.stack) {
if (!subView) {
subView = { orientations: context.orientation };
context.subViews[stackView] = subView;
} else if (subView.stack) {
throw new Error('A stack with name "' + stackView + '"" already exists');
}
subView.stack = {
Expand Down
Loading

0 comments on commit 49016f8

Please sign in to comment.