Browse Source

Merge pull request #821 in VISUAL/fineui from ~TELLER/fineui:bugfix/bugfix to master

* commit '2a60a458ae482e45becd05b4439d375707d5a093':
  update
  BI-39015
es6
Teller 6 years ago
parent
commit
7b57ba0693
  1. 6
      dist/bundle.ie.js
  2. 10
      dist/bundle.ie.min.js
  3. 6
      dist/bundle.js
  4. 14
      dist/bundle.min.js
  5. 6
      dist/core.js
  6. 6
      dist/fineui.ie.js
  7. 10
      dist/fineui.ie.min.js
  8. 6
      dist/fineui.js
  9. 14
      dist/fineui.min.js
  10. 2
      dist/utils.min.js
  11. 9
      src/core/platform/web/jquery/fn.js

6
dist/bundle.ie.js vendored

@ -29918,7 +29918,7 @@ $.extend($.Event.prototype, {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -29927,7 +29927,7 @@ $.extend($.Event.prototype, {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -29935,7 +29935,7 @@ $.extend($.Event.prototype, {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

10
dist/bundle.ie.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/bundle.js vendored

@ -29918,7 +29918,7 @@ $.extend($.Event.prototype, {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -29927,7 +29927,7 @@ $.extend($.Event.prototype, {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -29935,7 +29935,7 @@ $.extend($.Event.prototype, {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

14
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/core.js vendored

@ -29918,7 +29918,7 @@ $.extend($.Event.prototype, {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -29927,7 +29927,7 @@ $.extend($.Event.prototype, {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -29935,7 +29935,7 @@ $.extend($.Event.prototype, {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

6
dist/fineui.ie.js vendored

@ -30163,7 +30163,7 @@ $.extend($.Event.prototype, {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -30172,7 +30172,7 @@ $.extend($.Event.prototype, {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -30180,7 +30180,7 @@ $.extend($.Event.prototype, {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

10
dist/fineui.ie.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/fineui.js vendored

@ -30163,7 +30163,7 @@ $.extend($.Event.prototype, {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -30172,7 +30172,7 @@ $.extend($.Event.prototype, {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -30180,7 +30180,7 @@ $.extend($.Event.prototype, {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

14
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

2
dist/utils.min.js vendored

File diff suppressed because one or more lines are too long

9
src/core/platform/web/jquery/fn.js vendored

@ -95,7 +95,8 @@ if (jQuery) {
} }
if (tidx >= 0) { if (tidx >= 0) {
this.append(textLeft.substr(0, tidx)); // 标红的text未encode
this.append(BI.htmlEncode(textLeft.substr(0, tidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(tidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(tidx, keyword.length))));
@ -104,7 +105,8 @@ if (jQuery) {
py = py.substr(tidx + keyword.length); py = py.substr(tidx + keyword.length);
} }
} else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) { } else if (pidx != null && pidx >= 0 && Math.floor(pidx / text.length) === Math.floor((pidx + keyword.length - 1) / text.length)) {
this.append(textLeft.substr(0, pidx)); // 标红的text未encode
this.append(BI.htmlEncode(textLeft.substr(0, pidx)));
this.append($("<span>").addClass("bi-keyword-red-mark") this.append($("<span>").addClass("bi-keyword-red-mark")
.html(BI.htmlEncode(textLeft.substr(pidx, keyword.length)))); .html(BI.htmlEncode(textLeft.substr(pidx, keyword.length))));
if (py != null) { if (py != null) {
@ -112,7 +114,8 @@ if (jQuery) {
} }
textLeft = textLeft.substr(pidx + keyword.length); textLeft = textLeft.substr(pidx + keyword.length);
} else { } else {
this.append(textLeft); // 标红的text未encode
this.append(BI.htmlEncode(textLeft));
break; break;
} }
} }

Loading…
Cancel
Save