DaddyFrosty/yoga
1
0
Fork 0
Code Issues 96 Pull Requests 31 Actions Packages Projects Releases 33 Wiki Activity

remove a local variable

Browse Source
This commit is contained in:
Christopher Chedeau
2014-04-23 14:16:04 -07:00
parent c63281a064
commit 1937e5aacf
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Layout.js
View File

@@ -198,16 +198,14 @@ var computeLayout = (function() {
CSS_FLEX_DIRECTION_COLUMN : CSS_FLEX_DIRECTION_COLUMN :
CSS_FLEX_DIRECTION_ROW; CSS_FLEX_DIRECTION_ROW;
var/*bool*/ mainDimInStyle = isDimDefined(node, mainAxis); if (isUndefined(node.layout[dim[mainAxis]]) && isDimDefined(node, mainAxis)) {
if (isUndefined(node.layout[dim[mainAxis]]) && mainDimInStyle) {
node.layout[dim[mainAxis]] = fmaxf( node.layout[dim[mainAxis]] = fmaxf(
node.style[dim[mainAxis]], node.style[dim[mainAxis]],
getPaddingAndBorderAxis(node, mainAxis) getPaddingAndBorderAxis(node, mainAxis)
); );
} }
var/*bool*/ crossDimInStyle = isDimDefined(node, crossAxis); if (isUndefined(node.layout[dim[crossAxis]]) && isDimDefined(node, crossAxis)) {
if (isUndefined(node.layout[dim[crossAxis]]) && crossDimInStyle) {
node.layout[dim[crossAxis]] = fmaxf( node.layout[dim[crossAxis]] = fmaxf(
node.style[dim[crossAxis]], node.style[dim[crossAxis]],
getPaddingAndBorderAxis(node, crossAxis) getPaddingAndBorderAxis(node, crossAxis)
@@ -296,7 +294,7 @@ var computeLayout = (function() {
mainPos += getPaddingAndBorder(node, trailing[mainAxis]); mainPos += getPaddingAndBorder(node, trailing[mainAxis]);
crossDim += getPaddingAndBorderAxis(node, crossAxis); crossDim += getPaddingAndBorderAxis(node, crossAxis);
if (isUndefined(node.layout[dim[mainAxis]]) && !mainDimInStyle) { if (isUndefined(node.layout[dim[mainAxis]]) && !isDimDefined(node, mainAxis)) {
node.layout[dim[mainAxis]] = fmaxf(mainPos, getPaddingAndBorderAxis(node, mainAxis)); node.layout[dim[mainAxis]] = fmaxf(mainPos, getPaddingAndBorderAxis(node, mainAxis));
} }
if (isUndefined(node.layout[dim[crossAxis]])) { if (isUndefined(node.layout[dim[crossAxis]])) {