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

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

* commit '7ce0e1c96f05448cb271872a8031a855829389d0':
  update
  无JIRA任务 title跟随问题
es6
windy 6 years ago
parent
ff149dd3f5 7ce0e1c96f
commit
e4de592bd8
13 changed files with 387 additions and 224 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. 48
      dist/base.js
  2. 48
      dist/bundle.ie.js
  3. 56
      dist/bundle.ie.min.js
  4. 48
      dist/bundle.js
  5. 56
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 48
      dist/fineui.ie.js
  8. 68
      dist/fineui.ie.min.js
  9. 48
      dist/fineui.js
  10. 68
      dist/fineui.min.js
  11. 48
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 48
      src/base/single/single.js

48
dist/base.js vendored
Unescape View File

@ -401,6 +401,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -408,29 +419,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -439,9 +461,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

48
dist/bundle.ie.js vendored
Unescape View File

@ -35484,6 +35484,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -35491,29 +35502,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -35522,9 +35544,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

56
dist/bundle.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
dist/bundle.js vendored
Unescape View File

@ -35888,6 +35888,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -35895,29 +35906,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -35926,9 +35948,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

56
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

25
dist/demo.js vendored
Unescape View File

@ -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.
*/
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

48
dist/fineui.ie.js vendored
Unescape View File

@ -35726,6 +35726,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -35733,29 +35744,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -35764,9 +35786,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

68
dist/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
dist/fineui.js vendored
Unescape View File

@ -36130,6 +36130,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -36137,29 +36148,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -36168,9 +36190,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

68
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24640,6 +24640,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -24647,29 +24658,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -24678,9 +24700,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

48
src/base/single/single.js
Unescape View File

@ -59,6 +59,17 @@ BI.Single = BI.inherit(BI.Widget, {
}
},
_clearTimeOut: function() {
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
}
},
enableHover: function (opt) {
opt || (opt = {});
var self = this;
@ -66,29 +77,40 @@ BI.Single = BI.inherit(BI.Widget, {
this.element.on("mouseenter.title" + this.getName(), function (e) {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.timeout = BI.delay(function () {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
}, 500);
}
});
this.element.on("mousemove.title" + this.getName(), function (e) {
self._e = e;
if (!self.element.__isMouseInBounds__(e)) {
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._hideTooltip();
if (BI.isNotNull(self.showTimeout)) {
clearTimeout(self.showTimeout);
self.showTimeout = null;
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function () {
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
if (BI.isNotNull(self.timeout)) {
clearTimeout(self.timeout);
}
self._clearTimeOut();
self._hideTooltip();
});
this._hoverBinded = true;
@ -97,9 +119,7 @@ BI.Single = BI.inherit(BI.Widget, {
disabledHover: function () {
// 取消hover事件
if (BI.isNotNull(this.timeout)) {
clearTimeout(this.timeout);
}
this._clearTimeOut();
this._hideTooltip();
this.element.unbind("mouseenter.title" + this.getName())
.unbind("mousemove.title" + this.getName())

Write Preview
Loading…
Cancel
Save