guy 7 years ago
parent
commit
f3f6880ffc
  1. 13
      bi/base.js
  2. 13
      dist/base.js
  3. 13
      dist/bundle.js
  4. 2
      dist/bundle.min.js
  5. 13
      src/base/combination/combo.js

13
bi/base.js

@ -3168,9 +3168,9 @@ BI.Combo = BI.inherit(BI.Widget, {
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;
}
// if (!o.toggle && self.isViewVisible()) {
// return;
// }
o.toggle ? self._toggle() : self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -3191,9 +3191,9 @@ BI.Combo = BI.inherit(BI.Widget, {
var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
if (self.isViewVisible()) {
return;
}
// if (self.isViewVisible()) {
// return;
// }
self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -3295,6 +3295,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight();
this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
},

13
dist/base.js vendored

@ -3168,9 +3168,9 @@ BI.Combo = BI.inherit(BI.Widget, {
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;
}
// if (!o.toggle && self.isViewVisible()) {
// return;
// }
o.toggle ? self._toggle() : self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -3191,9 +3191,9 @@ BI.Combo = BI.inherit(BI.Widget, {
var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
if (self.isViewVisible()) {
return;
}
// if (self.isViewVisible()) {
// return;
// }
self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -3295,6 +3295,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight();
this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
},

13
dist/bundle.js vendored

@ -32195,9 +32195,9 @@ BI.Combo = BI.inherit(BI.Widget, {
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;
}
// if (!o.toggle && self.isViewVisible()) {
// return;
// }
o.toggle ? self._toggle() : self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -32218,9 +32218,9 @@ BI.Combo = BI.inherit(BI.Widget, {
var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
if (self.isViewVisible()) {
return;
}
// if (self.isViewVisible()) {
// return;
// }
self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -32322,6 +32322,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight();
this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
},

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

13
src/base/combination/combo.js

@ -126,9 +126,9 @@ BI.Combo = BI.inherit(BI.Widget, {
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;
}
// if (!o.toggle && self.isViewVisible()) {
// return;
// }
o.toggle ? self._toggle() : self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -149,9 +149,9 @@ BI.Combo = BI.inherit(BI.Widget, {
var debounce = BI.debounce(function (e) {
if (self.combo.element.__isMouseInBounds__(e)) {
if (self.isEnabled() && self.isValid() && self.combo.isEnabled() && self.combo.isValid()) {
if (self.isViewVisible()) {
return;
}
// if (self.isViewVisible()) {
// return;
// }
self._popupView();
if (self.isViewVisible()) {
self.fireEvent(BI.Controller.EVENT_CHANGE, BI.Events.EXPAND, "", self.combo);
@ -253,6 +253,7 @@ BI.Combo = BI.inherit(BI.Widget, {
this.adjustHeight();
this.element.addClass(this.options.comboClass);
$(document).unbind("mousedown." + this.getName()).unbind("mousewheel." + this.getName());
$(document).bind("mousedown." + this.getName(), BI.bind(this._hideIf, this)).bind("mousewheel." + this.getName(), BI.bind(this._hideIf, this));
this.fireEvent(BI.Combo.EVENT_AFTER_POPUPVIEW);
},

Loading…
Cancel
Save