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

Merge pull request #922 in VISUAL/fineui from ~DAILER/fineui:master to master 

* commit '51fac54a00f207fc9bf928ca79e4d41a72289e17':
  textContent IE问题修复
es6
Dailer 6 years ago
parent
773e854631 51fac54a00
commit
dbecfec88e
16 changed files with 37 additions and 28 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. 3
      dist/2.0/fineui.ie.js
  2. 4
      dist/2.0/fineui.ie.min.js
  3. 3
      dist/2.0/fineui.js
  4. 8
      dist/2.0/fineui.min.js
  5. 3
      dist/base.js
  6. 3
      dist/bundle.ie.js
  7. 4
      dist/bundle.ie.min.js
  8. 3
      dist/bundle.js
  9. 8
      dist/bundle.min.js
  10. 3
      dist/fineui.ie.js
  11. 4
      dist/fineui.ie.min.js
  12. 3
      dist/fineui.js
  13. 8
      dist/fineui.min.js
  14. 3
      dist/fineui_without_jquery_polyfill.js
  15. 2
      dist/utils.min.js
  16. 3
      src/base/single/text.js

3
dist/2.0/fineui.ie.js vendored
Unescape View File

@ -36148,7 +36148,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

4
dist/2.0/fineui.ie.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/2.0/fineui.js vendored
Unescape View File

@ -36552,7 +36552,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

8
dist/2.0/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/base.js vendored
Unescape View File

@ -659,7 +659,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

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

@ -36148,7 +36148,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

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

File diff suppressed because one or more lines are too long

3
dist/bundle.js vendored
Unescape View File

@ -36552,7 +36552,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

8
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

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

@ -36393,7 +36393,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

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

File diff suppressed because one or more lines are too long

3
dist/fineui.js vendored
Unescape View File

@ -36797,7 +36797,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

8
dist/fineui.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
dist/fineui_without_jquery_polyfill.js vendored
Unescape View File

@ -25228,7 +25228,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

2
dist/utils.min.js vendored
View File

File diff suppressed because one or more lines are too long

3
src/base/single/text.js
Unescape View File

@ -132,7 +132,8 @@ BI.Text = BI.inherit(BI.Single, {
setText: function (text) { setText: function (text) {
BI.Text.superclass.setText.apply(this, arguments); BI.Text.superclass.setText.apply(this, arguments);
this.options.text = text; // 为textContext赋值为undefined时在ie和edge下会真的显示undefined
this.options.text = BI.isNotNull(text) ? text : "";
if (BI.isIE9Below()) { if (BI.isIE9Below()) {
this.text.element.html(BI.htmlEncode(this._getShowText())); this.text.element.html(BI.htmlEncode(this._getShowText()));
return; return;

Write Preview
Loading…
Cancel
Save