This repository has been archived by the owner on Dec 2, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2fc8c20
commit 00906fc
Showing
4 changed files
with
24 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,7 +8,7 @@ | |
* @copyright Gloey Apps, 2015 | ||
* | ||
* @library autolayout.js | ||
* @version 0.5.1 | ||
* @version 0.5.2 | ||
*/ | ||
/** | ||
* Parts Copyright (C) 2011-2012, Alex Russell ([email protected]) | ||
|
@@ -3784,7 +3784,7 @@ function _processCascade(context, cascade, parentItem) { | |
case Orientation.ZINDEX: | ||
context.prevAttr = Attribute.ZINDEX; | ||
context.curAttr = Attribute.ZINDEX; | ||
context.relation.constant = prevView !== stackView ? 'default' : 0; | ||
context.relation.constant = !prevView ? 0 : context.relation.constant || 'default'; | ||
break; | ||
} | ||
context.constraints.push({ | ||
|
@@ -4119,7 +4119,14 @@ var VisualFormat = (function () { | |
if (metaInfo.spacing) { | ||
var value = JSON.parse(metaInfo.spacing); | ||
metaInfo.spacing = value; | ||
if (value === undefined || isNaN(value)) { | ||
if (Array.isArray(value)) { | ||
for (var sIdx = 0, len = value.length; sIdx < len; sIdx++) { | ||
if (isNaN(value[sIdx])) { | ||
delete metaInfo.spacing; | ||
break; | ||
} | ||
} | ||
} else if (value === undefined || isNaN(value)) { | ||
delete metaInfo.spacing; | ||
} | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.