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

DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用

es6
windy 6 years ago
parent
fdc9cc3ec3
commit
67a0ba275c
13 changed files with 279 additions and 171 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. 28
      dist/base.js
  2. 28
      dist/bundle.ie.js
  3. 57
      dist/bundle.ie.min.js
  4. 28
      dist/bundle.js
  5. 58
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 28
      dist/fineui.ie.js
  8. 56
      dist/fineui.ie.min.js
  9. 28
      dist/fineui.js
  10. 56
      dist/fineui.min.js
  11. 28
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 28
      src/base/single/single.js

28
dist/base.js vendored
Unescape View File

@ -402,13 +402,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -420,11 +422,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -436,22 +442,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

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

@ -35488,13 +35488,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -35506,11 +35508,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -35522,22 +35528,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

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

File diff suppressed because one or more lines are too long

28
dist/bundle.js vendored
Unescape View File

@ -35892,13 +35892,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -35910,11 +35912,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -35926,22 +35932,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

58
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, {

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

@ -35730,13 +35730,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -35748,11 +35750,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -35764,22 +35770,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

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

File diff suppressed because one or more lines are too long

28
dist/fineui.js vendored
Unescape View File

@ -36134,13 +36134,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -36152,11 +36154,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -36168,22 +36174,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

56
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

28
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24644,13 +24644,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -24662,11 +24664,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -24678,22 +24684,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -60,13 +60,15 @@ BI.Single = BI.inherit(BI.Widget, {
},
_clearTimeOut: function() {
console.log(this.showTimeout);
console.log(BI.isNotNull(this.showTimeout));
if (BI.isNotNull(this.showTimeout)) {
clearTimeout(this.showTimeout);
this.showTimeout = null;
}
if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout);
this.showTimeout = null;
this.hideTimeout = null;
}
},
@ -78,11 +80,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () {
self._showToolTip(self._e || e, opt);
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt);
}
}, 500);
}
});
@ -94,22 +100,28 @@ BI.Single = BI.inherit(BI.Widget, {
}
if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () {
self._hideTooltip();
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip();
}
}, 500);
}
self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout);
self.hideTimeout = null;
}
self._showToolTip(self._e || e, opt);
}
self._showToolTip(self._e || e, opt);
}, 500);
});
this.element.on("mouseleave.title" + this.getName(), function (e) {
self._e = null;
console.log("clear all");
self._clearTimeOut();
self._hideTooltip();
});

Write Preview
Loading…
Cancel
Save