Browse Source

Merge pull request #790 in VISUAL/fineui from ~WINDY/fineui:master to master

* commit 'e194a875dd16b1407d28d7d61b59143ec4058c25':
  BI-36269 Single title的几个enter/over/leave不需要冒泡
es6
windy 6 years ago
parent
commit
06c6a8bdd7
  1. 4
      dist/base.js
  2. 4
      dist/bundle.ie.js
  3. 54
      dist/bundle.ie.min.js
  4. 4
      dist/bundle.js
  5. 62
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 4
      dist/fineui.ie.js
  8. 48
      dist/fineui.ie.min.js
  9. 4
      dist/fineui.js
  10. 56
      dist/fineui.min.js
  11. 4
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 4
      src/base/single/single.js

4
dist/base.js vendored

@ -431,6 +431,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -457,12 +458,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

4
dist/bundle.ie.js vendored

@ -35517,6 +35517,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -35543,12 +35544,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

54
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/bundle.js vendored

@ -35921,6 +35921,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -35947,12 +35948,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

62
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored

@ -6126,7 +6126,30 @@ Demo.HtapeLayout = BI.inherit(BI.Widget, {
}; };
} }
}); });
BI.shortcut("demo.htape", Demo.HtapeLayout);/** BI.shortcut("demo.htape", Demo.HtapeLayout);Demo.InlineVerticalLayout = BI.inherit(BI.Widget, {
props: {
baseCls: "demo-absolute"
},
render: function () {
return {
type: "bi.inline_vertical_adapt",
items: [{
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 200
}, {
type: "bi.label",
text: "绝对布局",
cls: "layout-bg1",
width: 300,
height: 100
}]
};
}
});
BI.shortcut("demo.inline_vertical", Demo.InlineVerticalLayout);/**
* Created by User on 2017/3/22. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

4
dist/fineui.ie.js vendored

@ -35759,6 +35759,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -35785,12 +35786,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

48
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui.js vendored

@ -36163,6 +36163,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -36189,12 +36190,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

56
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

4
dist/fineui_without_jquery_polyfill.js vendored

@ -24673,6 +24673,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -24699,12 +24700,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

4
src/base/single/single.js

@ -89,6 +89,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
} }
e.stopPropagation();
}); });
this.element.on("mousemove.title" + this.getName(), function (e) { this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e; self._e = e;
@ -115,12 +116,13 @@ BI.Single = BI.inherit(BI.Widget, {
} }
}, 500); }, 500);
e.stopPropagation();
}); });
this.element.on("mouseleave.title" + this.getName(), function (e) { this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null; self._e = null;
self._clearTimeOut(); self._clearTimeOut();
self._hideTooltip(); self._hideTooltip();
e.stopPropagation();
}); });
this._hoverBinded = true; this._hoverBinded = true;
} }

Loading…
Cancel
Save