mirror of
https://github.com/konvajs/konva.git
synced 2026-01-09 11:34:38 +08:00
Merge branch 'master' of github.com:konvajs/konva
This commit is contained in:
@@ -866,15 +866,10 @@ export abstract class Node {
|
|||||||
var visible = this.visible(),
|
var visible = this.visible(),
|
||||||
parent = this.getParent();
|
parent = this.getParent();
|
||||||
|
|
||||||
if (relativeTo === parent && visible === 'inherit') {
|
|
||||||
return true;
|
|
||||||
} else if (relativeTo === parent) {
|
|
||||||
return visible;
|
|
||||||
}
|
|
||||||
// the following conditions are a simplification of the truth table above.
|
// the following conditions are a simplification of the truth table above.
|
||||||
// please modify carefully
|
// please modify carefully
|
||||||
if (visible === 'inherit') {
|
if (visible === 'inherit') {
|
||||||
if (parent) {
|
if (parent && parent !== relativeTo) {
|
||||||
return parent._isVisible(relativeTo);
|
return parent._isVisible(relativeTo);
|
||||||
} else {
|
} else {
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in New Issue
Block a user