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

Revert "DEC-15325 fix: 解决click-blur popup挂在body上和IE11子元素触发blur场景" 

This reverts commit 28bf2c834d.
es6
zsmj1994 4 years ago
parent
20a779a384
commit
09a8f9453a
1 changed files with 8 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      src/base/combination/combo.js

27
src/base/combination/combo.js
Unescape View File

@ -223,17 +223,13 @@
var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
// if (!o.toggle && self.isViewVisible()) {
// return;
// }
o.toggle ? self._toggle(e) : self._popupView(e);
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
self.fireEvent(BI.Combo.EVENT_EXPAND);
self.popupView.element.off("mouseenter." + self.getName()).on("mouseenter." + self.getName(), function (e) {
enterPopup = true;
self.popupView.element.on("mouseleave." + self.getName(), function (e) {
enterPopup = false;
self.popupView.element.off("mouseleave." + self.getName());
});
});
} else {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo);
self.fireEvent(BI.Combo.EVENT_COLLAPSE);
@ -247,30 +243,15 @@
self.element.off("click." + self.getName()).on("click." + self.getName(), function (e) {
debounce(e);
try {
self.element.focus();
self.element[0].focus();
} catch (e) {
}
st(e);
});
var enterCombo = false;
self.combo.element.off("mouseenter." + self.getName()).on("mouseenter." + self.getName(), function (e) {
enterCombo = true;
self.combo.element.on("mouseleave." + self.getName(), function (e) {
enterCombo = false;
self.combo.element.off("mouseleave." + self.getName());
});
});
self.element.off("blur." + self.getName()).on("blur." + self.getName(), function (e) {
if (self.isViewVisible()) {
if (!enterCombo && !enterPopup) {
self._hideView(e);
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.COLLAPSE, "", self.combo);
self.fireEvent(BI.Combo.EVENT_COLLAPSE);
}
}
st(e);
});

Write Preview
Loading…
Cancel
Save