Browse Source

update

master
guy 7 years ago
parent
commit
c2c060db47
  1. 66
      bi/widget.js
  2. 66
      dist/bundle.js
  3. 16
      dist/bundle.min.js
  4. 66
      dist/widget.js
  5. 66
      src/widget/interactivearrangement/interactivearrangement.js

66
bi/widget.js

@ -5226,11 +5226,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (vs.right.length > 0) { } else if (vs.right.length > 0) {
var temp = this._getRegionClientPosition(vs.right[0].id); var temp = this._getRegionClientPosition(vs.right[0].id);
l = temp.left + temp.width; l = temp.left + temp.width;
} else if (vs.center.length > 0) {
var temp = this._getRegionClientPosition(vs.center[0].id);
l = temp.left + temp.width / 2;
} }
var rs = vs.left.concat(vs.right); var rs = vs.left.concat(vs.right).concat(vs.center);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l)) { if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l) || self._isEqual(p.left + p.width / 2, l)) {
var topPoint = { var topPoint = {
top: p.top + p.height / 2, top: p.top + p.height / 2,
left: l left: l
@ -5275,11 +5278,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (hs.bottom.length > 0) { } else if (hs.bottom.length > 0) {
var temp = this._getRegionClientPosition(hs.bottom[0].id); var temp = this._getRegionClientPosition(hs.bottom[0].id);
t = temp.top + temp.height; t = temp.top + temp.height;
} else if (hs.middle.length > 0) {
var temp = this._getRegionClientPosition(hs.middle[0].id);
t = temp.top + temp.height / 2;
} }
var rs = hs.top.concat(hs.bottom); var rs = hs.top.concat(hs.bottom).concat(hs.middle);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t)) { if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t) || self._isEqual(p.top + p.height / 2, t)) {
var leftPoint = { var leftPoint = {
top: t, top: t,
left: p.left + p.width / 2 left: p.left + p.width / 2
@ -5315,66 +5321,18 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
_centerAlign: function (position, size, regions) { _centerAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._vAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var l;
if (cs.center.length > 0) {
var temp = this._getRegionClientPosition(cs.center[0].id);
l = temp.left + temp.width / 2;
}
BI.each(cs.center, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left + p.width / 2, l)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: l,
top: position.top + size.height / 2
}
});
}
});
return positions;
}, },
_middleAlign: function (position, size, regions) { _middleAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._hAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var t;
if (cs.middle.length > 0) {
var temp = this._getRegionClientPosition(cs.middle[0].id);
t = temp.top + temp.height / 2;
}
BI.each(cs.middle, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top + p.height / 2, t)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: position.left + size.width / 2,
top: t
}
});
}
});
return positions;
}, },

66
dist/bundle.js vendored

@ -83730,11 +83730,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (vs.right.length > 0) { } else if (vs.right.length > 0) {
var temp = this._getRegionClientPosition(vs.right[0].id); var temp = this._getRegionClientPosition(vs.right[0].id);
l = temp.left + temp.width; l = temp.left + temp.width;
} else if (vs.center.length > 0) {
var temp = this._getRegionClientPosition(vs.center[0].id);
l = temp.left + temp.width / 2;
} }
var rs = vs.left.concat(vs.right); var rs = vs.left.concat(vs.right).concat(vs.center);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l)) { if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l) || self._isEqual(p.left + p.width / 2, l)) {
var topPoint = { var topPoint = {
top: p.top + p.height / 2, top: p.top + p.height / 2,
left: l left: l
@ -83779,11 +83782,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (hs.bottom.length > 0) { } else if (hs.bottom.length > 0) {
var temp = this._getRegionClientPosition(hs.bottom[0].id); var temp = this._getRegionClientPosition(hs.bottom[0].id);
t = temp.top + temp.height; t = temp.top + temp.height;
} else if (hs.middle.length > 0) {
var temp = this._getRegionClientPosition(hs.middle[0].id);
t = temp.top + temp.height / 2;
} }
var rs = hs.top.concat(hs.bottom); var rs = hs.top.concat(hs.bottom).concat(hs.middle);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t)) { if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t) || self._isEqual(p.top + p.height / 2, t)) {
var leftPoint = { var leftPoint = {
top: t, top: t,
left: p.left + p.width / 2 left: p.left + p.width / 2
@ -83819,66 +83825,18 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
_centerAlign: function (position, size, regions) { _centerAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._vAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var l;
if (cs.center.length > 0) {
var temp = this._getRegionClientPosition(cs.center[0].id);
l = temp.left + temp.width / 2;
}
BI.each(cs.center, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left + p.width / 2, l)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: l,
top: position.top + size.height / 2
}
});
}
});
return positions;
}, },
_middleAlign: function (position, size, regions) { _middleAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._hAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var t;
if (cs.middle.length > 0) {
var temp = this._getRegionClientPosition(cs.middle[0].id);
t = temp.top + temp.height / 2;
}
BI.each(cs.middle, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top + p.height / 2, t)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: position.left + size.width / 2,
top: t
}
});
}
});
return positions;
}, },

16
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

66
dist/widget.js vendored

@ -5226,11 +5226,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (vs.right.length > 0) { } else if (vs.right.length > 0) {
var temp = this._getRegionClientPosition(vs.right[0].id); var temp = this._getRegionClientPosition(vs.right[0].id);
l = temp.left + temp.width; l = temp.left + temp.width;
} else if (vs.center.length > 0) {
var temp = this._getRegionClientPosition(vs.center[0].id);
l = temp.left + temp.width / 2;
} }
var rs = vs.left.concat(vs.right); var rs = vs.left.concat(vs.right).concat(vs.center);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l)) { if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l) || self._isEqual(p.left + p.width / 2, l)) {
var topPoint = { var topPoint = {
top: p.top + p.height / 2, top: p.top + p.height / 2,
left: l left: l
@ -5275,11 +5278,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (hs.bottom.length > 0) { } else if (hs.bottom.length > 0) {
var temp = this._getRegionClientPosition(hs.bottom[0].id); var temp = this._getRegionClientPosition(hs.bottom[0].id);
t = temp.top + temp.height; t = temp.top + temp.height;
} else if (hs.middle.length > 0) {
var temp = this._getRegionClientPosition(hs.middle[0].id);
t = temp.top + temp.height / 2;
} }
var rs = hs.top.concat(hs.bottom); var rs = hs.top.concat(hs.bottom).concat(hs.middle);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t)) { if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t) || self._isEqual(p.top + p.height / 2, t)) {
var leftPoint = { var leftPoint = {
top: t, top: t,
left: p.left + p.width / 2 left: p.left + p.width / 2
@ -5315,66 +5321,18 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
_centerAlign: function (position, size, regions) { _centerAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._vAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var l;
if (cs.center.length > 0) {
var temp = this._getRegionClientPosition(cs.center[0].id);
l = temp.left + temp.width / 2;
}
BI.each(cs.center, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left + p.width / 2, l)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: l,
top: position.top + size.height / 2
}
});
}
});
return positions;
}, },
_middleAlign: function (position, size, regions) { _middleAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._hAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var t;
if (cs.middle.length > 0) {
var temp = this._getRegionClientPosition(cs.middle[0].id);
t = temp.top + temp.height / 2;
}
BI.each(cs.middle, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top + p.height / 2, t)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: position.left + size.width / 2,
top: t
}
});
}
});
return positions;
}, },

66
src/widget/interactivearrangement/interactivearrangement.js

@ -115,11 +115,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (vs.right.length > 0) { } else if (vs.right.length > 0) {
var temp = this._getRegionClientPosition(vs.right[0].id); var temp = this._getRegionClientPosition(vs.right[0].id);
l = temp.left + temp.width; l = temp.left + temp.width;
} else if (vs.center.length > 0) {
var temp = this._getRegionClientPosition(vs.center[0].id);
l = temp.left + temp.width / 2;
} }
var rs = vs.left.concat(vs.right); var rs = vs.left.concat(vs.right).concat(vs.center);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l)) { if (self._isEqual(p.left, l) || self._isEqual(p.left + p.width, l) || self._isEqual(p.left + p.width / 2, l)) {
var topPoint = { var topPoint = {
top: p.top + p.height / 2, top: p.top + p.height / 2,
left: l left: l
@ -164,11 +167,14 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
} else if (hs.bottom.length > 0) { } else if (hs.bottom.length > 0) {
var temp = this._getRegionClientPosition(hs.bottom[0].id); var temp = this._getRegionClientPosition(hs.bottom[0].id);
t = temp.top + temp.height; t = temp.top + temp.height;
} else if (hs.middle.length > 0) {
var temp = this._getRegionClientPosition(hs.middle[0].id);
t = temp.top + temp.height / 2;
} }
var rs = hs.top.concat(hs.bottom); var rs = hs.top.concat(hs.bottom).concat(hs.middle);
BI.each(rs, function (i, region) { BI.each(rs, function (i, region) {
var p = self._getRegionClientPosition(region.id); var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t)) { if (self._isEqual(p.top, t) || self._isEqual(p.top + p.height, t) || self._isEqual(p.top + p.height / 2, t)) {
var leftPoint = { var leftPoint = {
top: t, top: t,
left: p.left + p.width / 2 left: p.left + p.width / 2
@ -204,66 +210,18 @@ BI.InteractiveArrangement = BI.inherit(BI.Widget, {
_centerAlign: function (position, size, regions) { _centerAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._vAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var l;
if (cs.center.length > 0) {
var temp = this._getRegionClientPosition(cs.center[0].id);
l = temp.left + temp.width / 2;
}
BI.each(cs.center, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.left + p.width / 2, l)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: l,
top: position.top + size.height / 2
}
});
}
});
return positions;
}, },
_middleAlign: function (position, size, regions) { _middleAlign: function (position, size, regions) {
var self = this; var self = this;
var cs = this._positionAt({ return this._hAlign({
left: position.left + size.width / 2, left: position.left + size.width / 2,
top: position.top + size.height / 2 top: position.top + size.height / 2
}, regions); }, regions);
var positions = [];
var t;
if (cs.middle.length > 0) {
var temp = this._getRegionClientPosition(cs.middle[0].id);
t = temp.top + temp.height / 2;
}
BI.each(cs.middle, function (i, region) {
var p = self._getRegionClientPosition(region.id);
if (self._isEqual(p.top + p.height / 2, t)) {
var topPoint = {
top: p.top + p.height / 2,
left: p.left + p.width / 2
};
positions.push({
id: p.id,
start: topPoint,
end: {
left: position.left + size.width / 2,
top: t
}
});
}
});
return positions;
}, },

Loading…
Cancel
Save