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

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

* commit 'e4ec3d519bbf9f4ac7b909ac2790cf5d8911162f':
  update
  update
  DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
es6
windy 6 years ago
parent
fdc9cc3ec3 e4ec3d519b
commit
4728e155bd
13 changed files with 226 additions and 139 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. 11
      dist/base.js
  2. 11
      dist/bundle.ie.js
  3. 57
      dist/bundle.ie.min.js
  4. 11
      dist/bundle.js
  5. 18
      dist/bundle.min.js
  6. 25
      dist/demo.js
  7. 11
      dist/fineui.ie.js
  8. 56
      dist/fineui.ie.min.js
  9. 11
      dist/fineui.js
  10. 18
      dist/fineui.min.js
  11. 11
      dist/fineui_without_jquery_polyfill.js
  12. 2
      dist/utils.min.js
  13. 11
      src/base/single/single.js

11
dist/base.js vendored
Unescape View File

@ -408,7 +408,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -420,11 +420,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -436,16 +440,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

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

@ -35494,7 +35494,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -35506,11 +35506,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -35522,16 +35526,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

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

File diff suppressed because one or more lines are too long

11
dist/bundle.js vendored
Unescape View File

@ -35898,7 +35898,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -35910,11 +35910,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -35926,16 +35930,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

18
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. * Created by User on 2017/3/22.
*/ */
Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, { Demo.LeftRightVerticalAdaptLayout = BI.inherit(BI.Widget, {

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

@ -35736,7 +35736,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -35748,11 +35748,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -35764,16 +35768,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

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

File diff suppressed because one or more lines are too long

11
dist/fineui.js vendored
Unescape View File

@ -36140,7 +36140,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -36152,11 +36152,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -36168,16 +36172,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

18
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

11
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -24650,7 +24650,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -24662,11 +24662,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -24678,16 +24682,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -66,7 +66,7 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if (BI.isNotNull(this.hideTimeout)) { if (BI.isNotNull(this.hideTimeout)) {
clearTimeout(this.hideTimeout); clearTimeout(this.hideTimeout);
this.showTimeout = null; this.hideTimeout = null;
} }
}, },
@ -78,11 +78,15 @@ BI.Single = BI.inherit(BI.Widget, {
self._e = e; self._e = e;
if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) { if (self.getTipType() === "warning" || (BI.isKey(self.getWarningTitle()) && !self.isEnabled())) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 200); }, 200);
} else if (self.getTipType() === "success" || self.isEnabled()) { } else if (self.getTipType() === "success" || self.isEnabled()) {
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
if (BI.isNotNull(self.showTimeout)) {
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);
} }
}); });
@ -94,16 +98,21 @@ BI.Single = BI.inherit(BI.Widget, {
} }
if(BI.isNull(self.hideTimeout)) { if(BI.isNull(self.hideTimeout)) {
self.hideTimeout = BI.delay(function () { self.hideTimeout = BI.delay(function () {
if (BI.isNotNull(self.hideTimeout)) {
self._hideTooltip(); self._hideTooltip();
}
}, 500); }, 500);
} }
self.showTimeout = BI.delay(function () { self.showTimeout = BI.delay(function () {
// DEC-5321 IE下如果回调已经进入事件队列，clearTimeout将不会起作用
if (BI.isNotNull(self.showTimeout)) {
if (BI.isNotNull(self.hideTimeout)) { if (BI.isNotNull(self.hideTimeout)) {
clearTimeout(self.hideTimeout); clearTimeout(self.hideTimeout);
self.hideTimeout = null; self.hideTimeout = null;
} }
self._showToolTip(self._e || e, opt); self._showToolTip(self._e || e, opt);
}
}, 500); }, 500);

Write Preview
Loading…
Cancel
Save