fanruan
/
fineui
4
1
Fork 2
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #560 in VISUAL/fineui from ~FAY/fineui:master to master 

* commit '0cc7185697a2bb2318085779238ba5398076d4fc':
  update
  Revert "update"
  Revert "update"
  update
  update
  update
es6
guy 7 years ago
parent
6e5382b397 0cc7185697
commit
a9c218f734
10 changed files with 115 additions and 109 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. 48
      dist/_fineui.min.js
  2. 14
      dist/bundle.js
  3. 80
      dist/bundle.min.js
  4. 8
      dist/core.js
  5. 14
      dist/fineui.js
  6. 48
      dist/fineui.min.js
  7. 6
      dist/widget.js
  8. 2
      src/widget/multiselect/multiselect.insert.trigger.js
  9. 2
      src/widget/multiselect/multiselect.trigger.js
  10. 2
      src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js

48
dist/_fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

14
dist/bundle.js vendored
Unescape View File

@ -28046,9 +28046,11 @@ BI.extend(jQuery.fn, {
}, },
__isMouseInBounds__: function (e) { __isMouseInBounds__: function (e) {
var offset2Body = this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + this.outerWidth() var width = offset2Body.width || this.outerWidth();
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + this.outerHeight()); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {
@ -98652,7 +98654,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -99341,7 +99343,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -104884,7 +104886,7 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

80
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

8
dist/core.js vendored
Unescape View File

@ -28046,9 +28046,11 @@ BI.extend(jQuery.fn, {
}, },
__isMouseInBounds__: function (e) { __isMouseInBounds__: function (e) {
var offset2Body = this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + this.outerWidth() var width = offset2Body.width || this.outerWidth();
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + this.outerHeight()); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {

14
dist/fineui.js vendored
Unescape View File

@ -28267,9 +28267,11 @@ BI.extend(jQuery.fn, {
}, },
__isMouseInBounds__: function (e) { __isMouseInBounds__: function (e) {
var offset2Body = this.offset(); var offset2Body = this.get(0).getBoundingClientRect ? this.get(0).getBoundingClientRect() : this.offset();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + this.outerWidth() var width = offset2Body.width || this.outerWidth();
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + this.outerHeight()); var height = offset2Body.height || this.outerHeight();
return !(e.pageX < offset2Body.left || e.pageX > offset2Body.left + width
|| e.pageY < offset2Body.top || e.pageY > offset2Body.top + height);
}, },
__hasZIndexMask__: function (zindex) { __hasZIndexMask__: function (zindex) {
@ -98873,7 +98875,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -99562,7 +99564,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -105105,7 +105107,7 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

48
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

6
dist/widget.js vendored
Unescape View File

@ -10472,7 +10472,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -11161,7 +11161,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });
@ -16704,7 +16704,7 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

2
src/widget/multiselect/multiselect.insert.trigger.js
Unescape View File

@ -110,7 +110,7 @@ BI.MultiSelectInsertTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

2
src/widget/multiselect/multiselect.trigger.js
Unescape View File

@ -107,7 +107,7 @@ BI.MultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

2
src/widget/searchmultitextvaluecombo/multitextvalue.combo.trigger.search.js
Unescape View File

@ -101,7 +101,7 @@ BI.SearchMultiSelectTrigger = BI.inherit(BI.Trigger, {
}); });
this.element.click(function (e) { this.element.click(function (e) {
if (self.element.__isMouseInBounds__(e) && !self.numberCounter.element.__isMouseInBounds__(e)) { if (self.element.find(e.target).length > 0) {
self.numberCounter.hideView(); self.numberCounter.hideView();
} }
}); });

Write Preview
Loading…
Cancel
Save