Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Pull request #1487: 无JIRA任务 bugfix 

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'cb828e51511bfd6e85c47a866d47220cea0c1c55':
  bugfix
  bugfix
es6
guy 4 years ago
parent
db61fa8f8e cb828e5151
commit
0e1d8dd51b
1 changed files with 38 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 71
      src/core/controller/controller.bubbles.js

71
src/core/controller/controller.bubbles.js
Unescape View File

@ -179,61 +179,66 @@ BI.BubblesController = BI.inherit(BI.Controller, {
break; break;
} }
} }
return this; } else {
} var position = this._getTopPosition(name, context, offsetStyle);
var position = this._getTopPosition(name, context, offsetStyle); this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset});
this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset}); if (!BI.DOM.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
if (!BI.DOM.isTopSpaceEnough(context, this.get(name), adjustYOffset)) {
this.get(name).invisible();
if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
}
BI.createWidget({
type: "bi.absolute",
element: container,
items: [{
el: this.storeBubbles[name]["bottom"]
}]
});
this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
if (!BI.DOM.isBottomSpaceEnough(context, this.get(name), adjustYOffset)) {
this.get(name).invisible(); this.get(name).invisible();
if (!this.storeBubbles[name]["right"]) { if (!this.storeBubbles[name]["bottom"]) {
this.storeBubbles[name]["right"] = this._createBubble("right", text, level); this.storeBubbles[name]["bottom"] = this._createBubble("bottom", text, level);
} }
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: container, element: container,
items: [{ items: [{
el: this.storeBubbles[name]["right"] el: this.storeBubbles[name]["bottom"]
}] }]
}); });
this.set(name, this.storeBubbles[name]["right"]); this.set(name, this.storeBubbles[name]["bottom"]);
var position = this._getRightPosition(name, context, offsetStyle); var position = this._getBottomPosition(name, context, offsetStyle);
this.get(name).element.css({left: position.left + adjustXOffset, top: position.top - adjustYOffset}); this.get(name).element.css({left: position.left + adjustXOffset, top: position.top + adjustYOffset});
if (!BI.DOM.isRightSpaceEnough(context, this.get(name), adjustXOffset)) { if (!BI.DOM.isBottomSpaceEnough(context, this.get(name), adjustYOffset)) {
this.get(name).invisible(); this.get(name).invisible();
if (!this.storeBubbles[name]["left"]) { if (!this.storeBubbles[name]["right"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30); this.storeBubbles[name]["right"] = this._createBubble("right", text, level);
} }
BI.createWidget({ BI.createWidget({
type: "bi.absolute", type: "bi.absolute",
element: container, element: container,
items: [{ items: [{
el: this.storeBubbles[name]["left"] el: this.storeBubbles[name]["right"]
}] }]
}); });
this.set(name, this.storeBubbles[name]["left"]); this.set(name, this.storeBubbles[name]["right"]);
var position = this._getLeftPosition(name, context, offsetStyle); var position = this._getRightPosition(name, context, offsetStyle);
this.get(name).element.css({ this.get(name).element.css({
left: position.left - adjustXOffset, left: position.left + adjustXOffset,
top: position.top - adjustYOffset top: position.top - adjustYOffset
}); });
if (!BI.DOM.isRightSpaceEnough(context, this.get(name), adjustXOffset)) {
this.get(name).invisible();
if (!this.storeBubbles[name]["left"]) {
this.storeBubbles[name]["left"] = this._createBubble("left", text, level, 30);
}
BI.createWidget({
type: "bi.absolute",
element: container,
items: [{
el: this.storeBubbles[name]["left"]
}]
});
this.set(name, this.storeBubbles[name]["left"]);
var position = this._getLeftPosition(name, context, offsetStyle);
this.get(name).element.css({
left: position.left - adjustXOffset,
top: position.top - adjustYOffset
});
}
} }
} }
} }
this.get(name).setText(text);
this.get(name).visible();
return this; return this;
}, },

Write Preview
Loading…
Cancel
Save